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

Commit 832779a5 authored by Alison Cichowlas's avatar Alison Cichowlas Committed by Android (Google) Code Review
Browse files

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

parents 4e092349 6e645551

core/java/com/android/internal/app/ChooserActivity.java

+0 −6
Original line number Diff line number Diff line
@@ -3454,8 +3454,6 @@ public class ChooserActivity extends ResolverActivity implements 


        private View createProfileView(ViewGroup parent) {

            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.setOnClickListener(ChooserActivity.this::onProfileClick);

            updateProfileViewButton();
@@ -3601,10 +3599,6 @@ public class ChooserActivity extends ResolverActivity implements 
            final ViewGroup viewGroup = (ViewGroup) holder.itemView;

            int start = getListPosition(position);

            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 end = start + columnCount - 1;

core/res/res/drawable/chooser_row_layer_list.xml

+4 −2
Original line number Diff line number Diff line
@@ -17,9 +17,11 @@ 
*/

-->

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

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

    </item>

</layer-list>

core/res/res/layout/chooser_az_label_row.xml

+3 −8
Original line number Diff line number Diff line
@@ -15,17 +15,12 @@ 
  ~ limitations under the License

  -->



<!-- Separator applied as background -->

<TextView xmlns:android="http://schemas.android.com/apk/res/android"

          android:text="@string/chooser_all_apps_button_label"

<ImageView xmlns:android="http://schemas.android.com/apk/res/android"

          android:contentDescription="@string/chooser_all_apps_button_label"

          android:background="@drawable/chooser_row_layer_list"

          android:textAppearance="?attr/textAppearanceSmall"

          android:textColor="?attr/textColorSecondary"

          android:textSize="14sp"

          android:singleLine="true"

          android:src="@drawable/chooser_row_layer_list"

          android:paddingTop="16dp"

          android:layout_width="match_parent"

          android:layout_height="wrap_content"

          android:scaleType="center"

          android:gravity="center"/>