Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3b46cae authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Follow framework API changes"

parents bc955aeb 66546c70

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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();