diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-11-12 13:18:26 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-11-12 13:57:49 -0800 |
| commit | d925e25a34804781177ef73e9885817b2af710f5 (patch) | |
| tree | 4a080166398be01536b5db34f709ce1173f98252 /AndroidManifest.xml | |
| parent | 928e78acea580b2dd9f4d5b8207ec50ef9fc258d (diff) | |
| download | packages_apps_Settings-d925e25a34804781177ef73e9885817b2af710f5.tar.gz packages_apps_Settings-d925e25a34804781177ef73e9885817b2af710f5.tar.bz2 packages_apps_Settings-d925e25a34804781177ef73e9885817b2af710f5.zip | |
Some more theme adjustment.
Also fix battery use button on device info to do the right thing.
Change-Id: I663429d5eb15ac4500feabeebd7ad2e3b8238409
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 596057292..c5e5eb734 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -130,7 +130,8 @@ </intent-filter> </activity-alias> - <activity android:name=".wifi.WifiInfo"> + <activity android:name=".wifi.WifiInfo" + android:theme="@android:style/Theme.Holo.DialogWhenLarge"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> @@ -138,7 +139,8 @@ </intent-filter> </activity> - <activity android:name=".wifi.WifiConfigInfo"> + <activity android:name=".wifi.WifiConfigInfo" + android:theme="@android:style/Theme.Holo.DialogWhenLarge"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> @@ -146,7 +148,8 @@ </intent-filter> </activity> - <activity android:name=".wifi.WifiAPITest"> + <activity android:name=".wifi.WifiAPITest" + android:theme="@android:style/Theme.Holo.DialogWhenLarge"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> @@ -154,7 +157,8 @@ </intent-filter> </activity> - <activity android:name=".wifi.WifiStatusTest"> + <activity android:name=".wifi.WifiStatusTest" + android:theme="@android:style/Theme.Holo.DialogWhenLarge"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> @@ -163,7 +167,7 @@ </activity> <activity-alias android:name=".wifi.WifiApSettings" - android:targetActivity="Settings"> + android:targetActivity="Settings"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> @@ -311,7 +315,8 @@ </activity> <activity android:name="PhysicalKeyboardSettings" - android:label="@string/builtin_keyboard_settings_title"> + android:label="@string/builtin_keyboard_settings_title" + android:theme="@android:style/Theme.Holo.DialogWhenLarge"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> @@ -391,7 +396,7 @@ </activity> <activity android:name="Settings$DeviceInfoSettingsActivity" - android:theme="@android:style/Theme.Holo.Extended" + android:theme="@android:style/Theme.Holo.DialogWhenLarge" android:label="@string/device_info_settings"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -407,7 +412,7 @@ <activity android:name="SettingsLicenseActivity" android:label="@string/settings_license_activity_title" - android:theme="@*android:style/Theme.Dialog.Alert"> + android:theme="@*android:style/Theme.Holo.Dialog.Alert"> <intent-filter> <action android:name="android.settings.LICENSE" /> <category android:name="android.intent.category.DEFAULT" /> @@ -416,7 +421,7 @@ <activity android:name="SettingsSafetyLegalActivity" android:label="@string/settings_safetylegal_activity_title" - android:theme="@*android:style/Theme.Dialog.Alert"> + android:theme="@*android:style/Theme.Holo.Dialog.Alert"> <intent-filter> <action android:name="android.settings.SAFETY" /> <category android:name="android.intent.category.DEFAULT" /> @@ -586,7 +591,9 @@ </intent-filter> </activity> - <activity android:name="IccLockSettings" android:label="@string/sim_lock_settings" + <activity android:name="IccLockSettings" + android:label="@string/sim_lock_settings" + android:theme="@android:style/Theme.Holo.DialogWhenLarge" android:process="com.android.phone"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -667,7 +674,9 @@ </activity> <!-- Runs in the phone process since it needs access to the Phone object --> - <activity android:name=".deviceinfo.Status" android:label="@string/device_status_activity_title" + <activity android:name=".deviceinfo.Status" + android:label="@string/device_status_activity_title" + android:theme="@android:style/Theme.Holo.DialogWhenLarge" android:process="com.android.phone"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -692,7 +701,9 @@ android:resource="@id/storage_settings" /> </activity> - <activity android:name="ApnEditor" android:label="@string/apn_edit"> + <activity android:name="ApnEditor" + android:label="@string/apn_edit" + android:theme="@android:style/Theme.Holo.DialogWhenLarge"> <intent-filter> <action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.EDIT" /> |