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

Merge "Some more theme adjustment."

Browse Source
This commit is contained in:
Dianne Hackborn
2010-11-12 16:45:11 -08:00
committed by Android (Google) Code Review
parent 505a0c2ad0 d925e25a34
commit 4b01856b71
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
AndroidManifest.xml
View File

@@ -130,7 +130,8 @@
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity android:name=".wifi.WifiInfo"> <activity android:name=".wifi.WifiInfo"
android:theme="@android:style/Theme.Holo.DialogWhenLarge">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -138,7 +139,8 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".wifi.WifiConfigInfo"> <activity android:name=".wifi.WifiConfigInfo"
android:theme="@android:style/Theme.Holo.DialogWhenLarge">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -146,7 +148,8 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".wifi.WifiAPITest"> <activity android:name=".wifi.WifiAPITest"
android:theme="@android:style/Theme.Holo.DialogWhenLarge">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -154,7 +157,8 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".wifi.WifiStatusTest"> <activity android:name=".wifi.WifiStatusTest"
android:theme="@android:style/Theme.Holo.DialogWhenLarge">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -311,7 +315,8 @@
</activity> </activity>
<activity android:name="PhysicalKeyboardSettings" <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> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -391,7 +396,7 @@
</activity> </activity>
<activity android:name="Settings$DeviceInfoSettingsActivity" <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"> android:label="@string/device_info_settings">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@@ -407,7 +412,7 @@
<activity android:name="SettingsLicenseActivity" <activity android:name="SettingsLicenseActivity"
android:label="@string/settings_license_activity_title" android:label="@string/settings_license_activity_title"
android:theme="@*android:style/Theme.Dialog.Alert"> android:theme="@*android:style/Theme.Holo.Dialog.Alert">
<intent-filter> <intent-filter>
<action android:name="android.settings.LICENSE" /> <action android:name="android.settings.LICENSE" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -416,7 +421,7 @@
<activity android:name="SettingsSafetyLegalActivity" <activity android:name="SettingsSafetyLegalActivity"
android:label="@string/settings_safetylegal_activity_title" android:label="@string/settings_safetylegal_activity_title"
android:theme="@*android:style/Theme.Dialog.Alert"> android:theme="@*android:style/Theme.Holo.Dialog.Alert">
<intent-filter> <intent-filter>
<action android:name="android.settings.SAFETY" /> <action android:name="android.settings.SAFETY" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -586,7 +591,9 @@
</intent-filter> </intent-filter>
</activity> </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"> android:process="com.android.phone">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@@ -667,7 +674,9 @@
</activity> </activity>
<!-- Runs in the phone process since it needs access to the Phone object --> <!-- 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"> android:process="com.android.phone">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@@ -692,7 +701,9 @@
android:resource="@id/storage_settings" /> android:resource="@id/storage_settings" />
</activity> </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> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.EDIT" /> <action android:name="android.intent.action.EDIT" />

2
res/values/styles.xml
View File

@@ -79,7 +79,7 @@
<item name="android:windowContentOverlay">@null</item> <item name="android:windowContentOverlay">@null</item>
</style> </style>
<style name="Theme.CreateShortCut" parent="android:Theme.Holo"> <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge">
</style> </style>
</resources> </resources>

4
res/xml/device_info_settings.xml
View File

@@ -35,11 +35,9 @@
<PreferenceScreen <PreferenceScreen
android:key="power_usage" android:key="power_usage"
android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
android:title="@string/power_usage_summary_title" android:title="@string/power_usage_summary_title"
android:summary="@string/power_usage_summary"> android:summary="@string/power_usage_summary">
<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.fuelgauge.PowerUsageSummary" />
</PreferenceScreen> </PreferenceScreen>
<!-- Legal Information --> <!-- Legal Information -->