commit c2b43dbee88e3cc12f267610fc077b021f31207a
author Jeff Sharkey <jsharkey@android.com> Wed Nov 28 17:09:19 2012 -0800
committer Jeff Sharkey <jsharkey@android.com> Thu Nov 29 14:50:02 2012 -0800
tree e410626cc114e5bb52d916603303c6a908f079e7
parent 0206284a661b3370a175bb8c28c005aa6b45d9d3

Avoid split action bar when it only has one item.  DO NOT MERGE.

Bug: 7632944
Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index f045db0..d94103e 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -393,7 +393,11 @@
                 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);
         }