diff options
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | res/values-night-v21/styles.xml | 4 | ||||
| -rw-r--r-- | res/values-v21/styles.xml | 4 | ||||
| -rw-r--r-- | res/values/styles.xml | 1 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/LauncherActivity.java | 1 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/SettingsActivity.java | 13 |
6 files changed, 12 insertions, 15 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2cb8b17..7cdbcda 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -7,12 +7,12 @@ </intent-filter> <meta-data android:name="android.view.im" android:resource="@xml/method"/> </service> - <activity android:name="juloo.keyboard2.SettingsActivity" android:icon="@mipmap/ic_launcher" android:label="@string/settings_activity_label" android:theme="@style/android:Theme.DeviceDefault" android:exported="true" android:directBootAware="true"> + <activity android:name="juloo.keyboard2.SettingsActivity" android:icon="@mipmap/ic_launcher" android:label="@string/settings_activity_label" android:theme="@style/appTheme" android:exported="true" android:directBootAware="true"> <intent-filter> <action android:name="android.intent.action.MAIN"/> </intent-filter> </activity> - <activity android:name="juloo.keyboard2.LauncherActivity" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:theme="@style/android:Theme.DeviceDefault" android:exported="true" android:directBootAware="true"> + <activity android:name="juloo.keyboard2.LauncherActivity" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:theme="@style/appTheme" android:exported="true" android:directBootAware="true"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> diff --git a/res/values-night-v21/styles.xml b/res/values-night-v21/styles.xml new file mode 100644 index 0000000..9daa919 --- /dev/null +++ b/res/values-night-v21/styles.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="appTheme" parent="@android:style/Theme.Material"/> +</resources> diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml new file mode 100644 index 0000000..56a4b58 --- /dev/null +++ b/res/values-v21/styles.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="appTheme" parent="@android:style/Theme.Material.Light"/> +</resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index fc753c3..07ed490 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -22,4 +22,5 @@ <item name="android:layout_marginHorizontal">16dp</item> <item name="android:layout_gravity">center</item> </style> + <style name="appTheme" parent="@android:style/Theme.DeviceDefault.DayNight"/> </resources> diff --git a/srcs/juloo.keyboard2/LauncherActivity.java b/srcs/juloo.keyboard2/LauncherActivity.java index f766466..b8906b5 100644 --- a/srcs/juloo.keyboard2/LauncherActivity.java +++ b/srcs/juloo.keyboard2/LauncherActivity.java @@ -25,6 +25,7 @@ public class LauncherActivity extends Activity @Override public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); setContentView(R.layout.launcher_activity); _intro_video = (VideoView)findViewById(R.id.launcher_intro_video); diff --git a/srcs/juloo.keyboard2/SettingsActivity.java b/srcs/juloo.keyboard2/SettingsActivity.java index d053552..2b7ae91 100644 --- a/srcs/juloo.keyboard2/SettingsActivity.java +++ b/srcs/juloo.keyboard2/SettingsActivity.java @@ -12,7 +12,6 @@ public class SettingsActivity extends PreferenceActivity @Override public void onCreate(Bundle savedInstanceState) { - detectSystemTheme(); super.onCreate(savedInstanceState); // The preferences can't be read when in direct-boot mode. Avoid crashing // and don't allow changing the settings. @@ -26,18 +25,6 @@ public class SettingsActivity extends PreferenceActivity addPreferencesFromResource(R.xml.settings); } - /** The default theme is [Theme.DeviceDefault], which is dark. Detect if the - system is using light theme. */ - void detectSystemTheme() - { - if (Build.VERSION.SDK_INT >= 14) - { - int ui_mode = getResources().getConfiguration().uiMode; - if ((ui_mode & Configuration.UI_MODE_NIGHT_NO) != 0) - setTheme(android.R.style.Theme_DeviceDefault_Light); - } - } - void fallbackEncrypted() { // Can't communicate with the user here. |