Merge "Sharesheet: a fresh coat of paint." (cdb97f61) · Commits · e / os / android_frameworks_base

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -1884,8 +1884,6 @@ public class ChooserActivity extends ResolverActivity {
		}

		if (startType == ChooserListAdapter.TARGET_SERVICE) {
		holder.row.setBackgroundColor(
		getColor(R.color.chooser_service_row_background_color));
		int nextStartType = mChooserListAdapter.getPositionTargetType(
		getFirstRowPosition(rowPosition + 1));
		int serviceSpacing = holder.row.getContext().getResources()

core/res/res/drawable/bottomsheet_background.xml

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2018 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.
		-->

		<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
		<corners
		android:topLeftRadius="?attr/dialogCornerRadius"
		android:topRightRadius="?attr/dialogCornerRadius" />
		<solid android:color="?attr/colorBackgroundFloating" />
		</shape>

core/res/res/drawable/ic_drag_handle.xml

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2016 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:pathData="M20.0,9.0L4.0,9.0l0.0,2.0l16.0,0.0L20.0,9.0zM4.0,15.0l16.0,0.0l0.0,-2.0L4.0,13.0l0.0,2.0z"/>
		</vector>
		No newline at end of file

core/res/res/layout/chooser_grid.xml

+16 −4

Original line number	Diff line number	Diff line
		@@ -25,11 +25,24 @@
		android:maxCollapsedHeightSmall="56dp"
		android:id="@id/contentPanel">


		<RelativeLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alwaysShow="true"
		android:background="?attr/colorBackgroundFloating">
		android:background="@drawable/bottomsheet_background">

		<ImageView
		android:id="@+id/drag"
		android:layout_width="48dp"
		android:layout_height="wrap_content"
		android:src="@drawable/ic_drag_handle"
		android:clickable="true"
		android:paddingTop="@dimen/chooser_edge_margin_normal"
		android:tint="?android:attr/textColorSecondary"
		android:layout_centerHorizontal="true"
		android:layout_alignParentTop="true" />

		<TextView android:id="@+id/profile_button"
		android:layout_width="wrap_content"
		android:layout_height="48dp"
		@@ -41,7 +54,7 @@
		android:textAppearance="?attr/textAppearanceButton"
		android:textColor="?attr/colorAccent"
		android:gravity="center_vertical"
		android:layout_alignParentTop="true"
		android:layout_below="@id/drag"
		android:layout_alignParentRight="true"
		android:singleLine="true"/>

		@@ -207,7 +220,6 @@
		android:clipToPadding="false"
		android:scrollbarStyle="outsideOverlay"
		android:background="?attr/colorBackgroundFloating"
		android:elevation="8dp"
		android:listSelector="@color/transparent"
		android:divider="@null"
		android:scrollIndicators="top"
		@@ -219,7 +231,7 @@
		android:layout_alwaysShow="true"
		android:background="?attr/colorBackgroundFloating"
		android:text="@string/noApplications"
		android:padding="32dp"
		android:padding="@dimen/chooser_edge_margin_normal"
		android:gravity="center"
		android:visibility="gone"/>

core/res/res/values/colors.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -199,8 +199,6 @@
		<color name="Red_700">#ffc53929</color>
		<color name="Red_800">#ffb93221</color>

		<color name="chooser_service_row_background_color">#fff5f5f5</color>

		<!-- Status bar color for semi transparent mode. -->
		<color name="system_bar_background_semi_transparent">#66000000</color> <!-- 40% black -->