Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d925e25a authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Some more theme adjustment. 

Also fix battery use button on device info to do the right thing.

Change-Id: I663429d5eb15ac4500feabeebd7ad2e3b8238409
parent 928e78ac

AndroidManifest.xml

+23 −12
Original line number Diff line number Diff line
@@ -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" />
@@ -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" />

res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
        <item name="android:windowContentOverlay">@null</item>

    </style>

    

    <style name="Theme.CreateShortCut" parent="android:Theme.Holo">

    <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge">

    </style>

    

</resources>

res/xml/device_info_settings.xml

+1 −3
Original line number Diff line number Diff line
@@ -35,11 +35,9 @@ 
        

        <PreferenceScreen

                android:key="power_usage"

                android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"

                android:title="@string/power_usage_summary_title"

                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>



        <!-- Legal Information -->