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

Commit a122be1c authored by Fan Zhang's avatar Fan Zhang
Browse files

Move non-theme styles to styles.xml 

1. Move SUW related themes into its own theme file.
2. Move non-theme styles into styles.xml
3. Move theme styles to themes.xml
4. Group all TextAppearence together in styles.xml
5. And remove some unused resources

Bug: 111454230
Test: manual
Change-Id: I1067a01cf1960bc72ec92528177ac5fcbd4faa3a
parent dec6b8cd

AndroidManifest.xml

+1 −4
Original line number Diff line number Diff line
@@ -1923,7 +1923,7 @@ 
        <activity android:name=".bluetooth.RequestPermissionActivity"

                  android:excludeFromRecents="true"

                  android:permission="android.permission.BLUETOOTH"

                  android:theme="@style/BluetoothPermission">

                  android:theme="@style/Theme.BluetoothPermission">

            <intent-filter android:priority="1">

                <action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />

                <action android:name="android.bluetooth.adapter.action.REQUEST_ENABLE" />
@@ -2520,9 +2520,6 @@ 
                <action android:name="android.settings.ALL_APPS_NOTIFICATION_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter android:priority="150">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.applications.manageapplications.ManageApplications" />

        </activity>

color-check-baseline.xml

+83 −195

File changed.

Preview size limit exceeded, changes collapsed.

res/layout/fallback_home_finishing_boot.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ 
            android:text="@*android:string/android_start_title"/>



        <ProgressBar

            android:theme="@style/FallbackHomeProgressBar"

            style="@android:style/Widget.Material.ProgressBar.Horizontal"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="12.75dp"

            android:colorControlActivated="?android:attr/textColorPrimary"

            android:indeterminate="true"/>



    </LinearLayout>

res/values/strings.xml

+0 −47

File changed.

Preview size limit exceeded, changes collapsed.

res/values/styles.xml

+106 −117

File changed.

Preview size limit exceeded, changes collapsed.