PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Follow framework API changes"

Browse Source
This commit is contained in:
Adam Powell
2011-08-02 18:45:24 -07:00
committed by Android (Google) Code Review
parent bc955aeb13 66546c7077
commit f3b46cae51
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -55,7 +55,7 @@
<application android:label="@string/settings_label" <application android:label="@string/settings_label"
android:icon="@mipmap/ic_launcher_settings" android:icon="@mipmap/ic_launcher_settings"
android:taskAffinity="" android:taskAffinity=""
android:theme="@android:style/Theme.Holo.SolidActionBar" android:theme="@android:style/Theme.Holo"
android:hardwareAccelerated="true"> android:hardwareAccelerated="true">
<!-- Settings --> <!-- Settings -->

2
src/com/android/settings/Settings.java
View File

@@ -83,7 +83,7 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
final int theme = getIntent().getIntExtra( final int theme = getIntent().getIntExtra(
EXTRA_THEME, android.R.style.Theme_Holo_SplitActionBarWhenNarrow); EXTRA_THEME, android.R.style.Theme_Holo);
setTheme(theme); setTheme(theme);
getMetaData(); getMetaData();