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

Commit 0c605c80 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move non-theme styles to styles.xml"

parents 20f85d2a a122be1c
Loading
Loading
Loading
Loading
+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>
+83 −195

File changed.

Preview size limit exceeded, changes collapsed.

+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>
+0 −47

File changed.

Preview size limit exceeded, changes collapsed.

+106 −117

File changed.

Preview size limit exceeded, changes collapsed.

Loading