diff options
| author | Adam Powell <adamp@google.com> | 2011-08-02 18:45:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-02 18:45:24 -0700 |
| commit | f3b46cae51af38754bfaef7212c2c56c4079d842 (patch) | |
| tree | 0471e74ba22e9883572ffd655222fc2aba4cb225 | |
| parent | bc955aeb13fdf9b09c593597be9e41c84c958401 (diff) | |
| parent | 66546c707780b47a4d3fad4013d369a42f9effd3 (diff) | |
| download | packages_apps_settings-f3b46cae51af38754bfaef7212c2c56c4079d842.zip packages_apps_settings-f3b46cae51af38754bfaef7212c2c56c4079d842.tar.gz packages_apps_settings-f3b46cae51af38754bfaef7212c2c56c4079d842.tar.bz2 | |
Merge "Follow framework API changes"
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/com/android/settings/Settings.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2b0902e..4b41c7c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -55,7 +55,7 @@ <application android:label="@string/settings_label" android:icon="@mipmap/ic_launcher_settings" android:taskAffinity="" - android:theme="@android:style/Theme.Holo.SolidActionBar" + android:theme="@android:style/Theme.Holo" android:hardwareAccelerated="true"> <!-- Settings --> diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 5a171e7..272c0d1 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -83,7 +83,7 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler { @Override protected void onCreate(Bundle savedInstanceState) { final int theme = getIntent().getIntExtra( - EXTRA_THEME, android.R.style.Theme_Holo_SplitActionBarWhenNarrow); + EXTRA_THEME, android.R.style.Theme_Holo); setTheme(theme); getMetaData(); |