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

Fixes to parent fragment names and other manifest issues.

Browse Source 
Bug: 5324865

Also, when jumping into a second+ level setting, make sure the header list
item is scrolled into view.

Change-Id: I714c1f80c8b20e23208763f1c30449a49f2a4082
This commit is contained in:
Amith Yamasani
2011-09-02 09:47:18 -07:00
parent 9fe945b854
commit 990fb52ef7
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@@ -153,6 +153,10 @@
android:value="com.android.settings.wifi.AdvancedWifiSettings" /> android:value="com.android.settings.wifi.AdvancedWifiSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/wifi_settings" /> android:resource="@id/wifi_settings" />
<meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
android:resource="@string/wifi_settings" />
<meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
android:value="com.android.settings.Settings$WifiSettingsActivity" />
</activity> </activity>
<activity android:name=".wifi.WifiInfo" <activity android:name=".wifi.WifiInfo"
@@ -354,7 +358,6 @@
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="com.android.settings.VOICE_INPUT_OUTPUT_SETTINGS" />
<action android:name="android.settings.INPUT_METHOD_SETTINGS" /> <action android:name="android.settings.INPUT_METHOD_SETTINGS" />
<category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -370,7 +373,6 @@
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="com.android.settings.VOICE_INPUT_OUTPUT_SETTINGS" />
<category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>

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

@@ -190,6 +190,7 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
mCurrentHeader = parentHeader; mCurrentHeader = parentHeader;
switchToHeaderLocal(parentHeader); switchToHeaderLocal(parentHeader);
highlightHeader();
mParentHeader = new Header(); mParentHeader = new Header();
mParentHeader.fragment mParentHeader.fragment
@@ -217,6 +218,7 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
Integer index = mHeaderIndexMap.get(mTopLevelHeaderId); Integer index = mHeaderIndexMap.get(mTopLevelHeaderId);
if (index != null) { if (index != null) {
getListView().setItemChecked(index, true); getListView().setItemChecked(index, true);
getListView().smoothScrollToPosition(index);
} }
} }
} }