diff --git a/Android.mk b/Android.mk index 060ba389d882a88d3eebbf49434dcd73ceb0e829..f705fe6e6fd255d12d1b7e189e852c85ab5d57f0 100644 --- a/Android.mk +++ b/Android.mk @@ -2,6 +2,16 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_SRC_FILES := \ + $(call all-logtags-files-under, src) + +LOCAL_MODULE := settings-logtags + +include $(BUILD_STATIC_JAVA_LIBRARY) + +# Build the Settings APK +include $(CLEAR_VARS) + LOCAL_JAVA_LIBRARIES := bouncycastle core-oj telephony-common ims-common LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-v4 \ @@ -11,13 +21,15 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-v7-appcompat \ android-support-v14-preference \ jsr305 \ + settings-logtags + +LOCAL_STATIC_JAVA_LIBRARIES += \ org.cyanogenmod.platform.internal LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - src/com/android/settings/EventLogTags.logtags + $(call all-java-files-under, src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \ frameworks/support/v7/preference/res \ diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 08247aad3726f48f57e27dff617bd20b5f7f7729..61157f6218ad9081d2130149a76b06360c84aa8b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -67,6 +67,7 @@ + @@ -81,6 +82,7 @@ + @@ -123,6 +125,7 @@ + @@ -385,11 +388,15 @@ android:exported="true" android:permission="android.permission.CONNECTIVITY_INTERNAL" android:taskAffinity="" - android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"> + android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"> + + + + @@ -589,7 +596,7 @@ @@ -758,7 +765,7 @@ @@ -882,29 +889,23 @@ android:label="@string/wallpaper_settings_fragment_title" android:icon="@drawable/ic_wallpaper" android:taskAffinity=""> - - - - - + - + android:resource="@string/wallpaper_suggestion_title" /> + android:resource="@string/wallpaper_suggestion_summary" /> + + + + + + + + + + + + + + @@ -1128,7 +1148,7 @@ + android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"> @@ -1246,7 +1266,7 @@ @@ -1638,7 +1658,7 @@ android:enabled="false" android:exported="true" android:taskAffinity="com.android.wizard" - android:theme="@style/SetupWizardDisableAppStartingTheme" + android:theme="@style/SuwThemeGlif.Light" android:icon="@drawable/ic_suggested_notifications"> @@ -1652,7 +1672,8 @@ android:resource="@string/notification_suggestion_summary" /> - + @@ -1699,7 +1720,7 @@ + android:theme="@style/SetupWizardTheme.Light"> @@ -1719,7 +1740,7 @@ @@ -1764,7 +1785,7 @@ + android:resource="@string/suggested_fingerprint_lock_settings_title" /> @@ -1777,33 +1798,35 @@ - - + android:theme="@style/SetupWizardTheme.Light" /> - + + - + android:theme="@style/SetupWizardTheme.Light"/> - + - + android:theme="@style/Theme.SubSettingsDialogWhenLarge"> @@ -2028,7 +2051,7 @@ + android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" /> + android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"> @@ -2078,7 +2101,7 @@ android:label="@string/bluetooth_permission_request" android:excludeFromRecents="true" android:permission="android.permission.BLUETOOTH" - android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"> + android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"> @@ -2099,14 +2122,14 @@ android:excludeFromRecents="true" android:exported="true" android:permission="android.permission.MANAGE_USB" - android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar"> + android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"> + android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"> @@ -2117,7 +2140,7 @@ android:label="@string/bluetooth_pairing_request" android:excludeFromRecents="true" android:permission="android.permission.BLUETOOTH" - android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"> + android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"> @@ -2140,7 +2163,7 @@ android:label="@string/bluetooth_connection_permission_request" android:excludeFromRecents="true" android:permission="android.permission.BLUETOOTH_ADMIN" - android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"> + android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"> @@ -2150,7 +2173,7 @@ @@ -2213,7 +2236,7 @@ @@ -2241,7 +2264,7 @@ @@ -2250,7 +2273,7 @@ @@ -2320,7 +2343,7 @@ @@ -2417,6 +2440,7 @@ @@ -2576,7 +2600,7 @@ + android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"> @@ -2594,7 +2618,7 @@ + android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"> @@ -2604,7 +2628,7 @@ + android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"> @@ -2778,7 +2802,7 @@ @@ -2866,7 +2890,7 @@ @@ -2884,7 +2908,7 @@ @@ -3010,7 +3034,7 @@ + android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"> @@ -3019,6 +3043,51 @@ android:value="true" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable-hdpi/ic_bt_config.png b/res/drawable-hdpi/ic_bt_config.png deleted file mode 100644 index a2049369e8eb477459df806dd9d98c40d42eb280..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_bt_config.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_bt_imaging.png b/res/drawable-hdpi/ic_bt_imaging.png deleted file mode 100644 index 62624eea0c4299be197c2fffbd1136deb426a5c6..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_bt_imaging.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_bt_laptop.png b/res/drawable-hdpi/ic_bt_laptop.png deleted file mode 100644 index 42c3dc5549e2583894e3aa9579560e639ca8bbc8..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_bt_laptop.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_lockscreen_ime.png b/res/drawable-hdpi/ic_lockscreen_ime.png deleted file mode 100644 index 70d35bf8e279dfdc7297830c942c1882e24a0e2e..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_lockscreen_ime.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_add_dark.png b/res/drawable-hdpi/ic_menu_add_dark.png deleted file mode 100644 index 40a26b123f5840cd944ecb0db643a5bd817f0766..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_menu_add_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_add_light.png b/res/drawable-hdpi/ic_menu_add_light.png deleted file mode 100644 index 91b035402ac307cb3b4930e0e8d29c06b1b03f1d..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_menu_add_light.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_add_white.png b/res/drawable-hdpi/ic_menu_add_white.png deleted file mode 100644 index 7638c6432617c92fa803fdf6d613ab62e4f116f3..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_menu_add_white.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_sysbar_quicksettings.png b/res/drawable-hdpi/ic_sysbar_quicksettings.png deleted file mode 100644 index a2049369e8eb477459df806dd9d98c40d42eb280..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_sysbar_quicksettings.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_bt_config.png b/res/drawable-mdpi/ic_bt_config.png deleted file mode 100644 index d266b39288dc31121b8e0991d6fcf94a29ff09be..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_bt_config.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_bt_imaging.png b/res/drawable-mdpi/ic_bt_imaging.png deleted file mode 100644 index 76234a67baea8692d35eff7f2182fc5b82f62cd5..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_bt_imaging.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_bt_laptop.png b/res/drawable-mdpi/ic_bt_laptop.png deleted file mode 100644 index 792e8df789a1d6278d5349e96324177b5babc0de..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_bt_laptop.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_lockscreen_ime.png b/res/drawable-mdpi/ic_lockscreen_ime.png deleted file mode 100644 index 3216776def011c92d1d61ff05a19a49223b37124..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_lockscreen_ime.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_add_dark.png b/res/drawable-mdpi/ic_menu_add_dark.png deleted file mode 100644 index d7aa7742c8bd799152cabd7261ed8fb13b923806..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_menu_add_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_add_light.png b/res/drawable-mdpi/ic_menu_add_light.png deleted file mode 100644 index 8b558100eead7a1925ac818346ed4acf2b550d79..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_menu_add_light.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_add_white.png b/res/drawable-mdpi/ic_menu_add_white.png deleted file mode 100644 index 40cdc820a7cc293916fd6baadb3a0c6f182b55a6..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_menu_add_white.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_sysbar_quicksettings.png b/res/drawable-mdpi/ic_sysbar_quicksettings.png deleted file mode 100644 index d266b39288dc31121b8e0991d6fcf94a29ff09be..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_sysbar_quicksettings.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_bt_config.png b/res/drawable-xhdpi/ic_bt_config.png deleted file mode 100644 index 46077be77a80560ed107ffd2b448315b56af509a..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_bt_config.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_bt_imaging.png b/res/drawable-xhdpi/ic_bt_imaging.png deleted file mode 100644 index 9ea3b858ccfb47cb705b8d72c0460602b118ad3f..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_bt_imaging.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_bt_laptop.png b/res/drawable-xhdpi/ic_bt_laptop.png deleted file mode 100644 index 1c053c8799cfd8e2770d8a3e1b6e8346cd53f1a2..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_bt_laptop.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_lockscreen_ime.png b/res/drawable-xhdpi/ic_lockscreen_ime.png deleted file mode 100644 index 02cc3afd776730e64b537c73ce5835905a713b58..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_lockscreen_ime.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_add_dark.png b/res/drawable-xhdpi/ic_menu_add_dark.png deleted file mode 100644 index 2f00b962ad79b683d78ae307200da2ce3688a3eb..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_menu_add_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_add_light.png b/res/drawable-xhdpi/ic_menu_add_light.png deleted file mode 100644 index 4109b2ca666653608263cb8acb9f2e86cfddac3c..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_menu_add_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_add_white.png b/res/drawable-xhdpi/ic_menu_add_white.png deleted file mode 100644 index 1d5398907f9aa86ea44ce166176bd2ef37f60f14..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_menu_add_white.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_sysbar_quicksettings.png b/res/drawable-xhdpi/ic_sysbar_quicksettings.png deleted file mode 100644 index 46077be77a80560ed107ffd2b448315b56af509a..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_sysbar_quicksettings.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_bt_config.png b/res/drawable-xxhdpi/ic_bt_config.png deleted file mode 100644 index ad964b41f40a33c91d0f75ebe39bc158a4cbb193..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxhdpi/ic_bt_config.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_bt_imaging.png b/res/drawable-xxhdpi/ic_bt_imaging.png deleted file mode 100644 index a0058dcaf6e65b6268ad789762110de39ff03728..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxhdpi/ic_bt_imaging.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_bt_laptop.png b/res/drawable-xxhdpi/ic_bt_laptop.png deleted file mode 100644 index bca714524809cddc6c279af89c765c2a8befc64e..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxhdpi/ic_bt_laptop.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_lockscreen_ime.png b/res/drawable-xxhdpi/ic_lockscreen_ime.png deleted file mode 100644 index f23b0e78d271a501fbd485f12ea71279a816d8d3..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxhdpi/ic_lockscreen_ime.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_menu_add_dark.png b/res/drawable-xxhdpi/ic_menu_add_dark.png deleted file mode 100644 index 0ab6a4037603c36b4d1ce912e94d74382e36f9eb..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxhdpi/ic_menu_add_dark.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_menu_add_light.png b/res/drawable-xxhdpi/ic_menu_add_light.png deleted file mode 100644 index 767b8080127096243af72afb9c32718b1b1ba409..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxhdpi/ic_menu_add_light.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_menu_add_white.png b/res/drawable-xxhdpi/ic_menu_add_white.png deleted file mode 100644 index 16a8b8a9603083f50f7f13a35e2eee1f59e14efe..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxhdpi/ic_menu_add_white.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_sysbar_quicksettings.png b/res/drawable-xxhdpi/ic_sysbar_quicksettings.png deleted file mode 100644 index ad964b41f40a33c91d0f75ebe39bc158a4cbb193..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxhdpi/ic_sysbar_quicksettings.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_bt_config.png b/res/drawable-xxxhdpi/ic_bt_config.png deleted file mode 100644 index e89d484c153475c2b0d7761d8023077cd48292ac..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxxhdpi/ic_bt_config.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_bt_imaging.png b/res/drawable-xxxhdpi/ic_bt_imaging.png deleted file mode 100644 index f0ffb52e290f7edb3ce9356d9373a3fc159ae825..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxxhdpi/ic_bt_imaging.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_bt_laptop.png b/res/drawable-xxxhdpi/ic_bt_laptop.png deleted file mode 100644 index 2d758bd32ad8e5a101b2dd78f74a79e005725a93..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxxhdpi/ic_bt_laptop.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_lockscreen_ime.png b/res/drawable-xxxhdpi/ic_lockscreen_ime.png deleted file mode 100644 index 2eb8a927644adecc88738143684d00b10a12efce..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxxhdpi/ic_lockscreen_ime.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_menu_add_dark.png b/res/drawable-xxxhdpi/ic_menu_add_dark.png deleted file mode 100644 index 01f53fee5e9b7d80ad9a40f9b82c91b391d24344..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxxhdpi/ic_menu_add_dark.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_menu_add_white.png b/res/drawable-xxxhdpi/ic_menu_add_white.png deleted file mode 100644 index 27a15f5f10689b3499ca1ceb159a383585f943d6..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxxhdpi/ic_menu_add_white.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_sysbar_quicksettings.png b/res/drawable-xxxhdpi/ic_sysbar_quicksettings.png deleted file mode 100644 index e89d484c153475c2b0d7761d8023077cd48292ac..0000000000000000000000000000000000000000 Binary files a/res/drawable-xxxhdpi/ic_sysbar_quicksettings.png and /dev/null differ diff --git a/res/drawable/fallback_home_unprovisioned_background.xml b/res/drawable/fallback_home_unprovisioned_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..9ec3874672a0cac5e8fc6bb561f1ce9a8d6b6986 --- /dev/null +++ b/res/drawable/fallback_home_unprovisioned_background.xml @@ -0,0 +1,19 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_bt_imaging.xml b/res/drawable/ic_bt_imaging.xml new file mode 100644 index 0000000000000000000000000000000000000000..01e78c0d4137f065e99883d67b02024440d81ba0 --- /dev/null +++ b/res/drawable/ic_bt_imaging.xml @@ -0,0 +1,27 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_bt_laptop.xml b/res/drawable/ic_bt_laptop.xml new file mode 100644 index 0000000000000000000000000000000000000000..bf2fd49e402f849adab1a1b451a47dd77fe6c0b0 --- /dev/null +++ b/res/drawable/ic_bt_laptop.xml @@ -0,0 +1,26 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_call_24dp.xml b/res/drawable/ic_call_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..26bbde5f3ca1c1f701ca0781a5937714e3444b6e --- /dev/null +++ b/res/drawable/ic_call_24dp.xml @@ -0,0 +1,29 @@ + + + + + diff --git a/res/drawable/ic_check_green_24dp.xml b/res/drawable/ic_check_green_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..c836a0237a72d7c89fd838a4b896ee27221024ec --- /dev/null +++ b/res/drawable/ic_check_green_24dp.xml @@ -0,0 +1,24 @@ + + + + + diff --git a/res/drawable/ic_cross_grey_24dp.xml b/res/drawable/ic_cross_grey_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..312c034a78619de9ec6d713336801078695348ae --- /dev/null +++ b/res/drawable/ic_cross_grey_24dp.xml @@ -0,0 +1,24 @@ + + + + + diff --git a/res/drawable/ic_fingerprint_error.xml b/res/drawable/ic_fingerprint_error.xml index d00280d929a7fe72d8de045e4ff1634dccd5c5f7..b822d45d3d6205ef515b9835fd660f22d0c9a792 100644 --- a/res/drawable/ic_fingerprint_error.xml +++ b/res/drawable/ic_fingerprint_error.xml @@ -19,12 +19,12 @@ android:viewportWidth="32.0" android:viewportHeight="32.0"> diff --git a/res/drawable/ic_fingerprint_header.xml b/res/drawable/ic_fingerprint_header.xml new file mode 100644 index 0000000000000000000000000000000000000000..e7ac81ab18f89ca8dd0a24e8146eafcc675371a6 --- /dev/null +++ b/res/drawable/ic_fingerprint_header.xml @@ -0,0 +1,38 @@ + + + + + + + + + diff --git a/res/drawable/ic_gesture_play_button.xml b/res/drawable/ic_gesture_play_button.xml new file mode 100644 index 0000000000000000000000000000000000000000..e2fa6e0ceafe3195b0501503867d2c2a03434e3b --- /dev/null +++ b/res/drawable/ic_gesture_play_button.xml @@ -0,0 +1,25 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_help_24dp.xml b/res/drawable/ic_help_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..d80b717079183edc1e450fd15d927e75ec06c2d0 --- /dev/null +++ b/res/drawable/ic_help_24dp.xml @@ -0,0 +1,31 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_lightbulb_outline_24.xml b/res/drawable/ic_lightbulb_outline_24.xml new file mode 100644 index 0000000000000000000000000000000000000000..89cf8fabc06b09e084c66f5f9f6f2d76cbd2ad72 --- /dev/null +++ b/res/drawable/ic_lightbulb_outline_24.xml @@ -0,0 +1,31 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/ic_lock.xml b/res/drawable/ic_lock.xml new file mode 100644 index 0000000000000000000000000000000000000000..975cbf54efba37a316dbc335b2234fc8e65c7db7 --- /dev/null +++ b/res/drawable/ic_lock.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/drawable/ic_menu_add.xml b/res/drawable/ic_menu_add.xml index ed580723135f1b164c5cd3204f1db55909653ec2..3387f294200a4bf1493ace5e1e26036fec2e001d 100644 --- a/res/drawable/ic_menu_add.xml +++ b/res/drawable/ic_menu_add.xml @@ -15,6 +15,13 @@ limitations under the License. --> - + + + diff --git a/res/drawable/ic_menu_add_white.xml b/res/drawable/ic_menu_add_white.xml new file mode 100644 index 0000000000000000000000000000000000000000..9a06d5cbca5083beb4b46a92636b11c68ce81f0d --- /dev/null +++ b/res/drawable/ic_menu_add_white.xml @@ -0,0 +1,26 @@ + + + + + + diff --git a/res/drawable/ic_settings.xml b/res/drawable/ic_settings.xml new file mode 100644 index 0000000000000000000000000000000000000000..439c1a7c8b6323edc37a5ea52f6a90380326bfe0 --- /dev/null +++ b/res/drawable/ic_settings.xml @@ -0,0 +1,36 @@ + + + + diff --git a/res/drawable/ic_settings_gestures.xml b/res/drawable/ic_settings_gestures.xml new file mode 100644 index 0000000000000000000000000000000000000000..9537bed2e342e6d9389a812412eb3547030f8df9 --- /dev/null +++ b/res/drawable/ic_settings_gestures.xml @@ -0,0 +1,25 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_settings_night_display.xml b/res/drawable/ic_settings_night_display.xml new file mode 100644 index 0000000000000000000000000000000000000000..edd1da72340410c2ad7a265cb6465744ed0f59a9 --- /dev/null +++ b/res/drawable/ic_settings_night_display.xml @@ -0,0 +1,27 @@ + + + + + + diff --git a/res/drawable/ic_shortcut_battery.xml b/res/drawable/ic_shortcut_battery.xml new file mode 100644 index 0000000000000000000000000000000000000000..97fdd11e34a67887ecbaef6402da01d9a2d22174 --- /dev/null +++ b/res/drawable/ic_shortcut_battery.xml @@ -0,0 +1,30 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_shortcut_data_usage.xml b/res/drawable/ic_shortcut_data_usage.xml new file mode 100644 index 0000000000000000000000000000000000000000..dddd4930141ff57d2e4f30728a4972c08af3bf78 --- /dev/null +++ b/res/drawable/ic_shortcut_data_usage.xml @@ -0,0 +1,31 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_shortcut_wireless.xml b/res/drawable/ic_shortcut_wireless.xml new file mode 100644 index 0000000000000000000000000000000000000000..d5607e5abd46056d6a5b174e1104e40bbf64c70c --- /dev/null +++ b/res/drawable/ic_shortcut_wireless.xml @@ -0,0 +1,29 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/selectable_card.xml b/res/drawable/selectable_card.xml index 554b9f6778c0317674bb07f5c405fdb38a04ae63..df9ddb1367054b1e58f73bd0ee134c292148a0d5 100644 --- a/res/drawable/selectable_card.xml +++ b/res/drawable/selectable_card.xml @@ -1,21 +1,22 @@ + Copyright (C) 2016 The Android Open Source Project - + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + + - + \ No newline at end of file diff --git a/res/drawable/selectable_card_grey.xml b/res/drawable/selectable_card_grey.xml new file mode 100644 index 0000000000000000000000000000000000000000..e4c73ba7040c6319e2c412c45c66bdd19dfe4d82 --- /dev/null +++ b/res/drawable/selectable_card_grey.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/res/drawable/switchbar_background.xml b/res/drawable/switchbar_background.xml index ac340be412a82400474624a1c2e05d402c81dc1c..a58f2e9f2f17907c578ff8dc946682e2e991f120 100644 --- a/res/drawable/switchbar_background.xml +++ b/res/drawable/switchbar_background.xml @@ -16,6 +16,6 @@ - + diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml deleted file mode 100644 index f79de614c7fb12a8a35911a29d4fc46923632d1b..0000000000000000000000000000000000000000 --- a/res/layout-land/choose_lock_password.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -