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

Commit 58c6dd6e authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Settings Visuals"

parents fcb84e69 322cfe8b

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -946,7 +946,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

            </intent-filter>

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

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

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

            </intent-filter>

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

res/layout/condition_card.xml

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingStart="16dp"

    android:background="?android:attr/colorAccent"

    android:elevation="3dp"

    android:clickable="true">
@@ -49,9 +49,9 @@ 
        <ImageView

            android:id="@+id/expand_indicator"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="match_parent"

            android:padding="16dp"

            android:tint="?android:attr/textColorPrimaryInverse"

            android:padding="?android:attr/listPreferredItemPaddingEnd"

            android:clickable="true"

            android:background="?android:attr/selectableItemBackground" />

res/layout/dashboard_category.xml

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
    android:id="@+id/category"

    android:layout_width="match_parent"

    android:layout_height="@dimen/dashboard_category_height"

    android:paddingStart="@dimen/dashboard_category_padding_start"

    android:paddingEnd="@dimen/dashboard_category_padding_end"

    android:orientation="vertical"

    android:paddingBottom="8dip"

    android:background="@color/card_background" >

res/layout/settings_main_prefs.xml

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
                android:id="@+id/main_content"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:paddingStart="@dimen/dashboard_padding_start"

                android:paddingEnd="@dimen/dashboard_padding_end"

                />



    </LinearLayout>

res/layout/suggestion_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginStart="@dimen/suggestion_arrow_margin"

        android:paddingStart="16dp"

        android:singleLine="true"

        android:textAppearance="@style/TextAppearance.TileTitle"

        android:textColor="?android:attr/colorAccent"