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

Merge "Sharesheet: remove 2 separators, restyle the 3rd." into sc-dev am: 832779a555

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

Change-Id: Id32582bca5eee837caa184c46852bcadc0c284ad
This commit is contained in:
Alison Cichowlas
2021-07-24 06:06:21 +00:00
committed by Automerger Merge Worker
parent f24fd234bd 832779a555
commit 969473792f
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3454,8 +3454,6 @@ public class ChooserActivity extends ResolverActivity implements
private View createProfileView(ViewGroup parent) { private View createProfileView(ViewGroup parent) {
View profileRow = mLayoutInflater.inflate(R.layout.chooser_profile_row, parent, false); View profileRow = mLayoutInflater.inflate(R.layout.chooser_profile_row, parent, false);
profileRow.setBackground(
getResources().getDrawable(R.drawable.chooser_row_layer_list, null));
mProfileView = profileRow.findViewById(R.id.profile_button); mProfileView = profileRow.findViewById(R.id.profile_button);
mProfileView.setOnClickListener(ChooserActivity.this::onProfileClick); mProfileView.setOnClickListener(ChooserActivity.this::onProfileClick);
updateProfileViewButton(); updateProfileViewButton();
@@ -3601,10 +3599,6 @@ public class ChooserActivity extends ResolverActivity implements
final ViewGroup viewGroup = (ViewGroup) holder.itemView; final ViewGroup viewGroup = (ViewGroup) holder.itemView;
int start = getListPosition(position); int start = getListPosition(position);
int startType = getRowType(start); int startType = getRowType(start);
if (viewGroup.getForeground() == null && position > 0) {
viewGroup.setForeground(
getResources().getDrawable(R.drawable.chooser_row_layer_list, null));
}
int columnCount = holder.getColumnCount(); int columnCount = holder.getColumnCount();
int end = start + columnCount - 1; int end = start + columnCount - 1;

6
core/res/res/drawable/chooser_row_layer_list.xml
View File

@@ -17,9 +17,11 @@
*/ */
--> -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:bottom="-5dp" android:left="-5dp" android:right="-5dp"> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<stroke android:width="1dp" android:color="@color/chooser_row_divider"/> <solid android:color="?android:attr/colorAccentSecondary"/>
<size android:width="128dp" android:height="2dp"/>
<corners android:radius="2dp" />
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

11
core/res/res/layout/chooser_az_label_row.xml
View File

@@ -15,17 +15,12 @@
~ limitations under the License ~ limitations under the License
--> -->
<!-- Separator applied as background --> <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:text="@string/chooser_all_apps_button_label"
android:contentDescription="@string/chooser_all_apps_button_label" android:contentDescription="@string/chooser_all_apps_button_label"
android:background="@drawable/chooser_row_layer_list" android:src="@drawable/chooser_row_layer_list"
android:textAppearance="?attr/textAppearanceSmall"
android:textColor="?attr/textColorSecondary"
android:textSize="14sp"
android:singleLine="true"
android:paddingTop="16dp" android:paddingTop="16dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scaleType="center"
android:gravity="center"/> android:gravity="center"/>