Merge "Update "NFC & more" Dashboard icon" into lmp-preview-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a2a0e70..d4579ce 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -181,7 +181,7 @@
</activity>
<activity android:name=".wifi.WifiSettingsForSetupWizardXL"
- android:theme="@android:style/Theme.Quantum.Light.NoActionBar"
+ android:theme="@android:style/Theme.Material.Light.NoActionBar"
android:screenOrientation="behind"
android:clearTaskOnLaunch="true"
android:windowSoftInputMode="adjustResize"
@@ -385,7 +385,7 @@
<activity android:name="DateTimeSettingsSetupWizard"
android:label="@string/date_and_time"
- android:theme="@android:style/Theme.Quantum.Light.NoActionBar"
+ android:theme="@android:style/Theme.Material.Light.NoActionBar"
android:screenOrientation="behind">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -500,7 +500,7 @@
<activity android:name=".inputmethod.UserDictionaryAddWordActivity"
android:label="@string/user_dict_settings_title"
- android:theme="@android:style/Theme.Quantum.Light.Dialog.NoActionBar"
+ android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar"
android:windowSoftInputMode="stateVisible"
android:noHistory="true"
android:excludeFromRecents="true">
@@ -588,7 +588,7 @@
<activity android:name="SettingsLicenseActivity"
android:label="@string/settings_license_activity_title"
- android:theme="@android:style/Theme.Quantum.Light.Panel"
+ android:theme="@android:style/Theme.Material.Light.Panel"
android:configChanges="orientation|screenSize">
<intent-filter>
<action android:name="android.settings.LICENSE" />
@@ -598,7 +598,7 @@
<activity android:name="SettingsSafetyLegalActivity"
android:label="@string/settings_safetylegal_activity_title"
- android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
+ android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
<intent-filter>
<action android:name="android.settings.SAFETY" />
<category android:name="android.intent.category.DEFAULT" />
@@ -1162,7 +1162,7 @@
</activity-alias>
<activity android:name=".AppPicker" android:label="@string/select_application"
- android:theme="@android:style/Theme.Quantum.Light.Dialog" />
+ android:theme="@android:style/Theme.Material.Light.Dialog" />
<activity android:name="Settings$UsbSettingsActivity"
android:label="@string/storage_title_usb"
@@ -1196,7 +1196,7 @@
<activity android:name=".bluetooth.BluetoothPairingDialog"
android:label="@string/bluetooth_pairing_request"
android:excludeFromRecents="true"
- android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
+ android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
<intent-filter>
<action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
<category android:name="android.intent.category.DEFAULT" />
@@ -1229,7 +1229,7 @@
android:label="@string/bluetooth_permission_request"
android:excludeFromRecents="true"
android:permission="android.permission.BLUETOOTH"
- android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
+ android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
<intent-filter>
<action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
<action android:name="android.bluetooth.adapter.action.REQUEST_ENABLE" />
@@ -1250,7 +1250,7 @@
android:label="@string/bluetooth_pairing_request"
android:excludeFromRecents="true"
android:permission="android.permission.BLUETOOTH"
- android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
+ android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
</activity>
<receiver android:name=".bluetooth.BluetoothPairingRequest">
@@ -1273,7 +1273,7 @@
android:label="@string/bluetooth_connection_permission_request"
android:excludeFromRecents="true"
android:permission="android.permission.BLUETOOTH_ADMIN"
- android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
+ android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
<intent-filter>
<action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST" />
<action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_CANCEL" />
@@ -1283,7 +1283,7 @@
<activity android:name="ActivityPicker"
android:label="@string/activity_picker_label"
- android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert"
+ android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"
android:finishOnCloseSystemDialogs="true">
<intent-filter>
<action android:name="android.intent.action.PICK_ACTIVITY" />
@@ -1395,7 +1395,7 @@
<!-- Standard picker for widgets -->
<activity android:name="AppWidgetPickActivity"
android:label="@string/widget_picker_title"
- android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert"
+ android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"
android:finishOnCloseSystemDialogs="true">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_PICK" />
@@ -1404,7 +1404,7 @@
</activity>
<activity android:name="AllowBindAppWidgetActivity"
- android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert"
+ android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"
android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true">
<intent-filter>
@@ -1416,7 +1416,7 @@
<!-- Special picker for keyguard widgets -->
<activity android:name="KeyguardAppWidgetPickActivity"
android:label="@string/widget_picker_title"
- android:theme="@android:style/Theme.Quantum.Wallpaper.NoTitleBar"
+ android:theme="@android:style/Theme.Material.Wallpaper.NoTitleBar"
android:permission="android.permission.BIND_KEYGUARD_APPWIDGET"
android:finishOnCloseSystemDialogs="true">
<intent-filter>
@@ -1511,7 +1511,7 @@
android:immersive="true"
android:launchMode="singleTop"
android:excludeFromRecents="true"
- android:theme="@android:style/Theme.Quantum.Light.NoActionBar"
+ android:theme="@android:style/Theme.Material.Light.NoActionBar"
android:configChanges="keyboard|keyboardHidden|uiMode"
android:windowSoftInputMode="adjustResize">
<intent-filter android:priority="10">
@@ -1610,7 +1610,7 @@
<activity android:name=".nfc.PaymentDefaultDialog"
android:label="@string/nfc_payment_set_default_label"
android:excludeFromRecents="true"
- android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
+ android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
<intent-filter>
<action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" />
<category android:name="android.intent.category.DEFAULT" />
@@ -1620,7 +1620,7 @@
<activity android:name=".SmsDefaultDialog"
android:label="@string/sms_application_title"
android:excludeFromRecents="true"
- android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
+ android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
<intent-filter>
<action android:name="android.provider.Telephony.ACTION_CHANGE_DEFAULT" />
<category android:name="android.intent.category.DEFAULT" />
@@ -1630,7 +1630,7 @@
<activity android:name=".ActiveNetworkScorerDialog"
android:label="@string/network_scorer_application"
android:excludeFromRecents="true"
- android:theme="@*android:style/Theme.Quantum.Light.Dialog.Alert">
+ android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
<intent-filter>
<action android:name="android.net.scoring.CHANGE_ACTIVE" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/res/drawable/data_usage_bar.xml b/res/drawable/data_usage_bar.xml
index b98dfb6..2e69710 100644
--- a/res/drawable/data_usage_bar.xml
+++ b/res/drawable/data_usage_bar.xml
@@ -16,18 +16,18 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
- <nine-patch android:src="@*android:drawable/progress_qntm_alpha"
- android:tint="@color/quantum_empty_color_light" />
+ <nine-patch android:src="@*android:drawable/progress_mtrl_alpha"
+ android:tint="@color/material_empty_color_light" />
</item>
<item android:id="@android:id/secondaryProgress">
<scale android:scaleWidth="100%">
- <nine-patch android:src="@*android:drawable/progress_qntm_alpha"
+ <nine-patch android:src="@*android:drawable/progress_mtrl_alpha"
android:tint="?android:attr/colorControlActivated" />
</scale>
</item>
<item android:id="@android:id/progress">
<scale android:scaleWidth="100%">
- <nine-patch android:src="@*android:drawable/progress_primary_qntm_alpha"
+ <nine-patch android:src="@*android:drawable/progress_primary_mtrl_alpha"
android:tint="?android:attr/colorControlActivated" />
</scale>
</item>
diff --git a/res/drawable/switch_inner.xml b/res/drawable/switch_inner.xml
index 2822915..c6d39ef 100644
--- a/res/drawable/switch_inner.xml
+++ b/res/drawable/switch_inner.xml
@@ -16,21 +16,21 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:state_checked="true">
- <bitmap android:src="@*android:drawable/btn_switch_to_off_qntm_000"
+ <bitmap android:src="@*android:drawable/btn_switch_to_off_mtrl_000"
android:tint="?android:attr/colorControlNormal"
android:alpha="?android:attr/disabledAlpha" />
</item>
<item android:state_enabled="false">
- <bitmap android:src="@*android:drawable/btn_switch_to_on_qntm_000"
+ <bitmap android:src="@*android:drawable/btn_switch_to_on_mtrl_000"
android:tint="?android:attr/colorControlNormal"
android:alpha="?android:attr/disabledAlpha" />
</item>
<item android:state_checked="true">
- <bitmap android:src="@*android:drawable/btn_switch_to_off_qntm_000"
+ <bitmap android:src="@*android:drawable/btn_switch_to_off_mtrl_000"
android:tint="@color/switch_accent_color" />
</item>
<item>
- <bitmap android:src="@*android:drawable/btn_switch_to_on_qntm_000"
+ <bitmap android:src="@*android:drawable/btn_switch_to_on_mtrl_000"
android:tint="?android:attr/colorControlNormal" />
</item>
</selector>
diff --git a/res/drawable/switch_track.xml b/res/drawable/switch_track.xml
index 466cc2c..2655da0 100644
--- a/res/drawable/switch_track.xml
+++ b/res/drawable/switch_track.xml
@@ -16,11 +16,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true">
- <nine-patch android:src="@*android:drawable/switch_track_qntm_alpha"
+ <nine-patch android:src="@*android:drawable/switch_track_mtrl_alpha"
android:tint="@color/switch_accent_color" />
</item>
<item>
- <nine-patch android:src="@*android:drawable/switch_track_qntm_alpha"
+ <nine-patch android:src="@*android:drawable/switch_track_mtrl_alpha"
android:tint="?android:attr/colorControlNormal" />
</item>
</selector>
diff --git a/res/layout/battery_history_chart.xml b/res/layout/battery_history_chart.xml
index 4d87a70..0d3e185 100644
--- a/res/layout/battery_history_chart.xml
+++ b/res/layout/battery_history_chart.xml
@@ -30,6 +30,6 @@
android:shadowDx="2"
android:shadowDy="2"
app:barPrimaryColor="?android:attr/colorControlActivated"
- app:barPredictionColor="@color/quantum_empty_color_light"
+ app:barPredictionColor="@color/material_empty_color_light"
app:chartMinHeight="@dimen/battery_history_chart_height">
</com.android.settings.fuelgauge.BatteryHistoryChart>
diff --git a/res/layout/settings_main.xml b/res/layout/settings_main.xml
index 46ead18..ddbf2af 100644
--- a/res/layout/settings_main.xml
+++ b/res/layout/settings_main.xml
@@ -32,7 +32,7 @@
android:layout_height="?android:attr/actionBarSize"
android:layout_width="match_parent"
android:background="@drawable/switchbar_background"
- android:theme="@android:style/Theme.Quantum" />
+ android:theme="@android:style/Theme.Material" />
<FrameLayout
android:id="@+id/prefs"
diff --git a/res/menu/options_menu.xml b/res/menu/options_menu.xml
index 1f35c5d..f73ce90 100644
--- a/res/menu/options_menu.xml
+++ b/res/menu/options_menu.xml
@@ -18,7 +18,7 @@
<item
android:id="@+id/search"
android:title="@string/search_menu"
- android:icon="@*android:drawable/ic_search_api_quantum"
+ android:icon="@*android:drawable/ic_search_api_material"
android:showAsAction="collapseActionView|ifRoom"
android:actionViewClass="android.widget.SearchView" />
</menu>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c58dffc..30516a1 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -47,27 +47,27 @@
<color name="lock_pattern_view_success_color">#ff009688</color>
<color name="lock_pattern_view_error_color">#fff4511e</color>
- <color name="quantum_blue_grey_50">#ffeceff1</color>
- <color name="quantum_blue_grey_100">#ffcfd8dc</color>
- <color name="quantum_blue_grey_300">#ff90a4ae</color>
- <color name="quantum_blue_grey_500">#ff607d8b</color>
- <color name="quantum_blue_grey_700">#ff455a64</color>
+ <color name="material_blue_grey_50">#ffeceff1</color>
+ <color name="material_blue_grey_100">#ffcfd8dc</color>
+ <color name="material_blue_grey_300">#ff90a4ae</color>
+ <color name="material_blue_grey_500">#ff607d8b</color>
+ <color name="material_blue_grey_700">#ff455a64</color>
- <color name="quantum_orange_100">#ffffe0b2</color>
- <color name="quantum_orange_300">#ffffb74d</color>
- <color name="quantum_orange_500">#ffff9800</color>
- <color name="quantum_orange_700">#fff57c00</color>
- <color name="quantum_orange_A200">#ffffab40</color>
- <color name="quantum_orange_A400">#ffff9100</color>
+ <color name="material_orange_100">#ffffe0b2</color>
+ <color name="material_orange_300">#ffffb74d</color>
+ <color name="material_orange_500">#ffff9800</color>
+ <color name="material_orange_700">#fff57c00</color>
+ <color name="material_orange_A200">#ffffab40</color>
+ <color name="material_orange_A400">#ffff9100</color>
- <color name="quantum_accent_color_light">#FF009688</color>
- <color name="quantum_accent_color_dark">#FF80CBC4</color>
- <color name="quantum_empty_color_light">#FFCED7DB</color>
+ <color name="material_accent_color_light">#FF009688</color>
+ <color name="material_accent_color_dark">#FF80CBC4</color>
+ <color name="material_empty_color_light">#FFCED7DB</color>
<!-- Palette colors referenced by top-level themes and manually copied into base theme. -->
<color name="theme_primary">#ff263238</color>
<color name="theme_primary_dark">@color/theme_primary</color>
- <color name="theme_accent">@color/quantum_accent_color_light</color>
+ <color name="theme_accent">@color/material_accent_color_light</color>
<color name="dashboard_background_color">#ffe1e1e0</color>
<color name="switchbar_background_color">#ff384248</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 79ed972..26b0ef3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -57,7 +57,7 @@
</style>
- <style name="TextAppearance" parent="android:TextAppearance.Quantum">
+ <style name="TextAppearance" parent="android:TextAppearance.Material">
</style>
<style name="TextAppearance.info_label">
@@ -75,7 +75,7 @@
<item name="android:textStyle">normal</item>
</style>
- <style name="TextAppearance.PasswordEntry" parent="android:TextAppearance.Quantum">
+ <style name="TextAppearance.PasswordEntry" parent="android:TextAppearance.Material">
<item name="android:gravity">center</item>
<item name="android:singleLine">true</item>
<item name="android:textStyle">bold</item>
@@ -202,18 +202,18 @@
<item name="android:windowIsFloating">true</item>
</style>
- <style name="CryptKeeperBlankTheme" parent="@android:style/Theme.Quantum.Light.NoActionBar">
+ <style name="CryptKeeperBlankTheme" parent="@android:style/Theme.Material.Light.NoActionBar">
<item name="android:background">#ff000000</item>
</style>
- <style name="SecurityPreferenceButtonContainer" parent="@android:style/Widget.Quantum.Light.SegmentedButton">
+ <style name="SecurityPreferenceButtonContainer" parent="@android:style/Widget.Material.Light.SegmentedButton">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:weightSum">2</item>
<item name="android:dividerPadding">8dip</item>
</style>
- <style name="SecurityPreferenceButton" parent="@android:style/Widget.Quantum.Light.Button.Borderless">
+ <style name="SecurityPreferenceButton" parent="@android:style/Widget.Material.Light.Button.Borderless">
<item name="android:layout_width">0dip</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_height">wrap_content</item>
@@ -239,7 +239,7 @@
<item name="android:widgetLayout">@layout/preference_inputmethod_widget</item>
</style>
- <style name="TextAppearance.PagerTabs" parent="@android:style/TextAppearance.Quantum.Small">
+ <style name="TextAppearance.PagerTabs" parent="@android:style/TextAppearance.Material.Small">
<item name="android:textAllCaps">true</item>
<item name="android:textStyle">bold</item>
</style>
@@ -255,23 +255,23 @@
<item name="android:layout">@layout/apn_preference_layout</item>
</style>
- <style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Quantum.Medium">
+ <style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium">
</style>
- <style name="TextAppearance.Small" parent="@android:style/TextAppearance.Quantum.Small">
+ <style name="TextAppearance.Small" parent="@android:style/TextAppearance.Material.Small">
</style>
<style name="TextAppearance.Switch" parent="TextAppearance.Medium">
</style>
- <style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.Quantum.Small">
+ <style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.Material.Small">
<item name="android:textColor">#FF009688</item>
</style>
- <style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Quantum.Medium">
+ <style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Material.Medium">
</style>
- <style name="TextAppearance.TileSubTitle" parent="@android:style/TextAppearance.Quantum.Small">
+ <style name="TextAppearance.TileSubTitle" parent="@android:style/TextAppearance.Material.Small">
</style>
<style name="TextAppearance.RecentsTitle" parent="TextAppearance.CategoryTitle">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 246e253..82f0bc1 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -21,40 +21,40 @@
<attr name="setup_divider_color" format="reference" />
<attr name="wifi_signal" format="reference" />
- <style name="SetupWizardWifiTheme" parent="android:Theme.Quantum.NoActionBar">
+ <style name="SetupWizardWifiTheme" parent="android:Theme.Material.NoActionBar">
<item name="android:windowSoftInputMode">adjustPan</item>
<item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
<item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
- <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_quantum</item>
+ <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_dark</item>
<item name="setup_divider_color">@color/setup_divider_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal_dark</item>
</style>
- <style name="SetupWizardWifiTheme.Light" parent="android:Theme.Quantum.Light.NoActionBar">
+ <style name="SetupWizardWifiTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
<item name="android:windowSoftInputMode">adjustPan</item>
<item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
<item name="ic_menu_add">@drawable/ic_menu_add_light</item>
- <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_quantum</item>
+ <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_light</item>
<item name="setup_divider_color">@color/setup_divider_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal_light</item>
</style>
- <style name="Theme.WifiDialog" parent="@*android:style/Theme.Quantum.Dialog.Alert">
+ <style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item>
<item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
- <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_quantum</item>
+ <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_dark</item>
<item name="wifi_signal">@drawable/wifi_signal_dark</item>
</style>
- <style name="Theme.Light.WifiDialog" parent="@*android:style/Theme.Quantum.Light.Dialog.Alert">
+ <style name="Theme.Light.WifiDialog" parent="@*android:style/Theme.Material.Light.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item>
<item name="ic_menu_add">@drawable/ic_menu_add_light</item>
- <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_quantum</item>
+ <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_light</item>
<item name="wifi_signal">@drawable/wifi_signal_light</item>
</style>
@@ -63,7 +63,7 @@
layouts against a remote context using our local theme colors. Due to the implementation
details of Theme, we can't reference any local resources and MUST instead use the values
directly. So use #ff263238 instead of @color/theme_primary and so on. -->
- <style name="Theme.SettingsBase" parent="@android:style/Theme.Quantum.Light.DarkActionBar">
+ <style name="Theme.SettingsBase" parent="@android:style/Theme.Material.Light.DarkActionBar">
<!-- Should match @color/theme_primary. -->
<item name="android:colorPrimary">#ff263238</item>
<!-- Should match @color/theme_primary_dark. -->
@@ -96,11 +96,11 @@
</style>
- <style name="Theme.ActionBar" parent="@android:style/Widget.Quantum.Light.ActionBar.Solid">
+ <style name="Theme.ActionBar" parent="@android:style/Widget.Material.Light.ActionBar.Solid">
<item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>
</style>
- <style name="Theme.DialogWhenLarge" parent="android:style/Theme.Quantum.Light.DialogWhenLarge">
+ <style name="Theme.DialogWhenLarge" parent="android:style/Theme.Material.Light.DialogWhenLarge">
<!-- Used by the ActionBar -->
<item name="android:colorPrimary">@color/theme_primary</item>
<!-- Used by the StatusBar -->
@@ -114,10 +114,10 @@
<style name="Theme.SubSettingsDialogWhenLarge" parent="Theme.DialogWhenLarge">
<item name="android:actionBarWidgetTheme">@null</item>
- <item name="android:actionBarTheme">@android:style/ThemeOverlay.Quantum.Dark.ActionBar</item>
+ <item name="android:actionBarTheme">@android:style/ThemeOverlay.Material.Dark.ActionBar</item>
</style>
- <style name="Theme.AlertDialog" parent="@*android:style/Theme.Quantum.Light.Dialog.Alert">
+ <style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Light.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item>
<!-- Used by the ActionBar -->
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 0e2af0e..ad7d473 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1043,8 +1043,12 @@
category.removeTile(n);
}
} else if (id == R.id.user_settings) {
+ boolean hasMultipleUsers =
+ ((UserManager) getSystemService(Context.USER_SERVICE))
+ .getUserCount() > 1;
if (!UserHandle.MU_ENABLED
- || !UserManager.supportsMultipleUsers()
+ || (!UserManager.supportsMultipleUsers()
+ && !hasMultipleUsers)
|| Utils.isMonkeyRunning()) {
category.removeTile(n);
}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index a05aaa9..901ee50 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -186,7 +186,9 @@
}
final Context context = getActivity();
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
- if (!mUserManager.supportsMultipleUsers() || Utils.isMonkeyRunning()) {
+ boolean hasMultipleUsers = mUserManager.getUserCount() > 1;
+ if ((!UserManager.supportsMultipleUsers() && !hasMultipleUsers)
+ || Utils.isMonkeyRunning()) {
mEnabled = false;
return;
}
@@ -201,7 +203,8 @@
mMePreference.setSummary(R.string.user_owner);
}
mAddUser = findPreference(KEY_ADD_USER);
- if (!mIsOwner || UserManager.getMaxSupportedUsers() < 2) {
+ if (!mIsOwner || UserManager.getMaxSupportedUsers() < 2
+ || !UserManager.supportsMultipleUsers()) {
removePreference(KEY_ADD_USER);
} else {
mAddUser.setOnPreferenceClickListener(this);