Merge "Follow framework API changes"

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 -->

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();