diff options
| -rw-r--r-- | core/java/com/android/internal/app/ChooserActivity.java | 2 | ||||
| -rw-r--r-- | core/res/res/drawable/bottomsheet_background.xml | 22 | ||||
| -rw-r--r-- | core/res/res/drawable/ic_drag_handle.xml | 23 | ||||
| -rw-r--r-- | core/res/res/layout/chooser_grid.xml | 20 | ||||
| -rw-r--r-- | core/res/res/values/colors.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
6 files changed, 61 insertions, 9 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index ee96ae985331..0879af3df32a 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -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() diff --git a/core/res/res/drawable/bottomsheet_background.xml b/core/res/res/drawable/bottomsheet_background.xml new file mode 100644 index 000000000000..bc32ba6e3896 --- /dev/null +++ b/core/res/res/drawable/bottomsheet_background.xml @@ -0,0 +1,22 @@ +<?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> diff --git a/core/res/res/drawable/ic_drag_handle.xml b/core/res/res/drawable/ic_drag_handle.xml new file mode 100644 index 000000000000..67ab84d4080d --- /dev/null +++ b/core/res/res/drawable/ic_drag_handle.xml @@ -0,0 +1,23 @@ +<!-- + 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 diff --git a/core/res/res/layout/chooser_grid.xml b/core/res/res/layout/chooser_grid.xml index f78466168e13..14a5310a4ff2 100644 --- a/core/res/res/layout/chooser_grid.xml +++ b/core/res/res/layout/chooser_grid.xml @@ -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"/> diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index 16c074484e2c..02fae4a2c1b3 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -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 --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 6d4b04c5e66a..401a7fec972a 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2744,7 +2744,6 @@ <java-symbol type="drawable" name="scroll_indicator_material" /> <java-symbol type="layout" name="chooser_row" /> - <java-symbol type="color" name="chooser_service_row_background_color" /> <java-symbol type="id" name="target_badge" /> <java-symbol type="bool" name="config_supportDoubleTapWake" /> <java-symbol type="drawable" name="ic_perm_device_info" /> |