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

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

Browse Source 
* commit 'a04497d70cc4f422cfa36c5be2f35a6170d5725a':
  Avoid split action bar when it only has one item.  DO NOT MERGE.
This commit is contained in:
Jeff Sharkey
2012-11-29 18:02:08 -08:00
committed by Android Git Automerger
parent fc6f304a9f a04497d70c
commit 2f12147e91
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}