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

Commit 29870ede authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

Merge "Match add network button width to master switch and tint it." into qt-dev 

am: 19626c24

Change-Id: I733482a8f1ec024068e06f6f55632b200919e440
parents f52939f2 19626c24

res/layout/preference_widget_add.xml

+2 −0
Original line number Diff line number Diff line
@@ -21,10 +21,12 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center"

    android:minWidth="@dimen/two_target_min_width"

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

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

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

    android:scaleType="center"

    android:src="@drawable/ic_add_24dp"

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

    android:contentDescription="@string/add" />

res/layout/preference_widget_master_switch.xml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
    android:id="@+id/switchWidget"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:minWidth="@dimen/two_target_min_width"

    android:gravity="center_vertical"

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

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

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -393,4 +393,6 @@ 


    <!-- Elevation of bluetooth icon -->

    <dimen name="bt_icon_elevation">4dp</dimen>



    <dimen name="two_target_min_width">80dp</dimen>

</resources>