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

Commit ac4597bf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I5bdc1f46,Idd24fd51 into sc-dev am: cfe4767b am: 3bbaa52c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15113790

Change-Id: Id31712deabe80ed29e85a65b9d78387f0d8dd5a6
parents 1f5cc17c 3bbaa52c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ public class ChooserActivity extends ResolverActivity implements

        final DisplayResolveInfo dri = new DisplayResolveInfo(
                originalIntent, ri, getString(R.string.screenshot_edit), "", resolveIntent, null);
        dri.setDisplayIcon(getDrawable(R.drawable.ic_menu_edit));
        dri.setDisplayIcon(getDrawable(R.drawable.ic_screenshot_edit));
        return dri;
    }

+3 −2
Original line number Diff line number Diff line
@@ -23,8 +23,9 @@
            android:insetRight="0dp"
            android:insetBottom="8dp">
            <shape android:shape="rectangle">
                <corners android:radius="16dp" />
                <solid android:color="@color/system_neutral2_100" />
                <corners android:radius="8dp" />
                <stroke android:width="1dp"
                    android:color="?android:attr/colorAccentPrimaryVariant"/>
            </shape>
        </inset>
    </item>
+24 −0
Original line number Diff line number Diff line
<!--
Copyright (C) 2014 The Android Open Source Project

   Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at

         http://www.apache.org/licenses/LICENSE-2.0

    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24.0dp"
    android:height="24.0dp"
    android:viewportWidth="24.0"
    android:viewportHeight="24.0">
    <path
        android:fillColor="#FFFFFFFF"
        android:pathData="M20.41,4.94l-1.35,-1.35c-0.78,-0.78 -2.05,-0.78 -2.83,0l0,0L3,16.82V21h4.18L20.41,7.77C21.2,6.99 21.2,5.72 20.41,4.94zM6.41,19.06L5,19v-1.36l9.82,-9.82l1.41,1.41L6.41,19.06z"/>
</vector>
 No newline at end of file
+2 −2
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@
    android:paddingStart="12dp"
    android:paddingEnd="12dp"
    android:drawablePadding="8dp"
    android:textColor="@color/text_color_primary_device_default_light"
    android:textColor="?android:attr/textColorPrimary"
    android:textSize="12sp"
    android:maxWidth="192dp"
    android:singleLine="true"
    android:clickable="true"
    android:background="@drawable/chooser_action_button_bg"
    android:drawableTint="@color/text_color_primary_device_default_light"
    android:drawableTint="?android:attr/textColorPrimary"
    android:drawableTintMode="src_in"
    style="?android:attr/borderlessButtonStyle"
    />
+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@
                  android:paddingBottom="@dimen/chooser_view_spacing"
                  android:paddingLeft="24dp"
                  android:paddingRight="24dp"
                  android:visibility="gone"
                  android:layout_below="@id/drag"
                  android:layout_centerHorizontal="true"/>
    </RelativeLayout>
Loading