Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I5bdc1f46,Idd24fd51 into sc-dev am: cfe4767b40

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

Change-Id: I40ea8875f98ea2e9efe21c13a17cf6d2e83bca3a
This commit is contained in:
TreeHugger Robot
2021-06-30 22:04:19 +00:00
committed by Automerger Merge Worker
parent 2eadea5139 cfe4767b40
commit 3bbaa52c9e
7 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -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;
}

5
core/res/res/drawable/chooser_action_button_bg.xml
View File

@@ -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
core/res/res/drawable/ic_screenshot_edit.xml Normal file
View File

@@ -0,0 +1,24 @@
<!--
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>

4
core/res/res/layout/chooser_action_button.xml
View File

@@ -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
core/res/res/layout/chooser_grid.xml
View File

@@ -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>

2
core/res/res/values/dimens.xml
View File

@@ -886,7 +886,7 @@
<dimen name="seekbar_thumb_exclusion_max_size">48dp</dimen>
<!-- chooser/resolver (sharesheet) spacing -->
<dimen name="chooser_corner_radius">8dp</dimen>
<dimen name="chooser_corner_radius">16dp</dimen>
<dimen name="chooser_row_text_option_translate">25dp</dimen>
<dimen name="chooser_view_spacing">18dp</dimen>
<dimen name="chooser_edge_margin_thin">16dp</dimen>

1
core/res/res/values/symbols.xml
View File

@@ -4168,6 +4168,7 @@
<java-symbol type="drawable" name="ic_work_apps_off" />
<java-symbol type="drawable" name="ic_sharing_disabled" />
<java-symbol type="drawable" name="ic_no_apps" />
<java-symbol type="drawable" name="ic_screenshot_edit" />
<java-symbol type="dimen" name="resolver_empty_state_height" />
<java-symbol type="dimen" name="resolver_empty_state_height_with_tabs" />
<java-symbol type="dimen" name="resolver_max_collapsed_height_with_tabs" />