diff options
| author | Jason Monk <jmonk@google.com> | 2015-06-01 19:54:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-01 19:54:53 +0000 |
| commit | ef1d4b66abd4e3c1ff4759a4dba7f7f5947af2d3 (patch) | |
| tree | 1c5edf4dbb0d39305042bad0312a4d71ac9c6aaf /res | |
| parent | 0d2eea38bf79a76a3179259442116a995dcb2e6f (diff) | |
| parent | 3d95908e0292c4121d1e127968a2ed2efb484d4a (diff) | |
| download | packages_apps_Settings-ef1d4b66abd4e3c1ff4759a4dba7f7f5947af2d3.zip packages_apps_Settings-ef1d4b66abd4e3c1ff4759a4dba7f7f5947af2d3.tar.gz packages_apps_Settings-ef1d4b66abd4e3c1ff4759a4dba7f7f5947af2d3.tar.bz2 | |
Merge "Make Theme a DropDownPreference" into mnc-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/attrs.xml | 5 | ||||
| -rw-r--r-- | res/xml/development_prefs.xml | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 248cf92..4b607be 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -113,4 +113,9 @@ <!-- Confirm device credentials screen --> <attr name="confirmDeviceCredentialsSideMargin" format="dimension" /> <attr name="confirmDeviceCredentialsTopMargin" format="dimension" /> + + <declare-styleable name="DropDownPreference"> + <attr name="android:entries" /> + <attr name="android:entryValues" /> + </declare-styleable> </resources> diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml index a24da21..fef2623 100644 --- a/res/xml/development_prefs.xml +++ b/res/xml/development_prefs.xml @@ -65,11 +65,10 @@ android:persistent="false" android:title="@string/system_ui_settings" /> - <ListPreference + <com.android.settings.DropDownPreference android:key="night_mode" android:title="@string/night_mode_title" android:summary="@string/night_mode_summary" - android:persistent="false" android:entries="@array/night_mode_entries" android:entryValues="@array/night_mode_values" /> |