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

Commit 5d376860 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev

parents 6e8644bc c2b43dbe

AndroidManifest.xml

+8 −3
Original line number Diff line number Diff line
@@ -252,7 +252,9 @@ 
            </intent-filter>

        </activity-alias>



        <activity android:name="ApnSettings" android:label="@string/apn_settings"

        <activity android:name="ApnSettings"

                android:label="@string/apn_settings"

                android:uiOptions="none"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:launchMode="singleTask">

            <intent-filter>
@@ -304,6 +306,7 @@ 


        <activity android:name="Settings$TetherSettingsActivity"

                android:label="@string/tether_settings_title_all"

                android:uiOptions="none"

                android:taskAffinity=""

                android:excludeFromRecents="true">

            <intent-filter>
@@ -325,6 +328,7 @@ 
        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name=".TetherSettings"

                  android:label="@string/tether_settings_title_all"

                  android:uiOptions="none"

                  android:clearTaskOnLaunch="true"

                  android:exported="true"

                  android:targetActivity="Settings$TetherSettingsActivity">
@@ -763,6 +767,7 @@ 


        <activity android:name="Settings$LocationSettingsActivity"

                android:label="@string/location_settings_title"

                android:uiOptions="none"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:taskAffinity=""

                android:excludeFromRecents="true">

src/com/android/settings/Settings.java

+5 −1
Original line number Diff line number Diff line
@@ -393,7 +393,11 @@ public class Settings extends PreferenceActivity 
                VpnSettings.class.getName().equals(fragmentName) ||

                SecuritySettings.class.getName().equals(fragmentName) ||

                InstalledAppDetails.class.getName().equals(fragmentName) ||

                ChooseLockGenericFragment.class.getName().equals(fragmentName)) {

                ChooseLockGenericFragment.class.getName().equals(fragmentName) ||

                TetherSettings.class.getName().equals(fragmentName) ||

                ApnSettings.class.getName().equals(fragmentName) ||

                LocationSettings.class.getName().equals(fragmentName) ||

                ZonePicker.class.getName().equals(fragmentName)) {

            intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);

        }