diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-09-02 09:47:18 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2011-09-25 14:49:49 -0700 |
| commit | 990fb52ef7e3eac5b6faa105ed242c3228c3c848 (patch) | |
| tree | e17e288d9fd1a564596146611d6441b0a6da2def /AndroidManifest.xml | |
| parent | 9fe945b854f92314ad387705ad20a129e46c317a (diff) | |
| download | packages_apps_settings-990fb52ef7e3eac5b6faa105ed242c3228c3c848.zip packages_apps_settings-990fb52ef7e3eac5b6faa105ed242c3228c3c848.tar.gz packages_apps_settings-990fb52ef7e3eac5b6faa105ed242c3228c3c848.tar.bz2 | |
Fixes to parent fragment names and other manifest issues.
Bug: 5324865
Also, when jumping into a second+ level setting, make sure the header list
item is scrolled into view.
Change-Id: I714c1f80c8b20e23208763f1c30449a49f2a4082
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5269457..71a2d7f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -153,6 +153,10 @@ android:value="com.android.settings.wifi.AdvancedWifiSettings" /> <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" 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 android:name=".wifi.WifiInfo" @@ -354,7 +358,6 @@ android:clearTaskOnLaunch="true"> <intent-filter> <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" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.DEFAULT" /> @@ -370,7 +373,6 @@ android:clearTaskOnLaunch="true"> <intent-filter> <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.DEFAULT" /> </intent-filter> |