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

Commit 2dd21a8a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10296977 from d3df7f50 to udc-release

Change-Id: I614cb480ac17f1c6a5a62e6e572134092da032bb
parents a7c0f2a8 d3df7f50
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@
    <!-- Description for using device controls feature with a locked phone [CHAR LIMIT=NONE] -->
    <string name="lockscreen_trivial_controls_summary" product="default">Without unlocking your phone</string>
    <!-- Description for using device controls feature with a locked tablet [CHAR LIMIT=NONE] -->
    <string name="lockscreen_trivial_controls_summary" product="tabled">Without unlocking your tablet</string>
    <string name="lockscreen_trivial_controls_summary" product="tablet">Without unlocking your tablet</string>

    <!-- Accessibility summary text for auto rotate [CHAR LIMIT=NONE] -->
    <string name="auto_rotate_summary_a11y" product="default">When you move your phone between portrait and landscape</string>
+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@
       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
       android:shape="rectangle">
    <solid
        android:color="?androidprv:attr/materialColorPrimaryContainer" />
        android:color="?androidprv:attr/materialColorSecondaryContainer" />
    <stroke
        android:width="1dp"
        android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
        android:color="?androidprv:attr/materialColorOnSecondaryContainer"/>
    <corners android:radius="@dimen/rect_button_radius" />
</shape>
+2 −4
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:paddingBottom="24dp">
            android:orientation="vertical">

            <Button
                android:id="@+id/cancelButton"
@@ -87,6 +86,7 @@
                android:paddingStart="?attr/sudMarginStart"
                android:paddingEnd="?attr/sudMarginEnd"
                android:layout_marginTop="12dp"
                android:layout_marginBottom="12dp"
                android:gravity="center_vertical"/>

            <Button
@@ -96,8 +96,6 @@
                android:layout_height="wrap_content"
                android:layout_marginStart="?attr/sudMarginStart"
                android:layout_marginEnd="?attr/sudMarginEnd"
                android:layout_marginTop="60dp"
                android:layout_marginBottom="14dp"
                android:visibility="gone"
                android:layout_gravity="center_horizontal"
                android:text="@string/work_challenge_emergency_button_text"/>
+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@
                android:layout_marginStart="?attr/sudMarginStart"
                android:layout_marginEnd="?attr/sudMarginEnd"
                android:layout_marginTop="12dp"
                android:layout_marginBottom="12dp"
                android:gravity="center_vertical"/>

            <CheckBox
+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ public class BubblePreference extends Preference implements View.OnClickListener
            mView.setSelected(selected);

            int colorResId = selected
                    ? com.android.internal.R.attr.materialColorOnPrimaryContainer
                    ? com.android.internal.R.attr.materialColorOnSecondaryContainer
                    : com.android.internal.R.attr.materialColorOnSurfaceVariant;
            ColorStateList stateList = Utils.getColorAttr(context, colorResId);
            mImageView.setImageTintList(stateList);
Loading