diff options
Diffstat (limited to 'java')
17 files changed, 58 insertions, 36 deletions
diff --git a/java/res/color/resolver_profile_tab_text.xml b/java/res/color/resolver_profile_tab_text.xml index c82aeefb..7c2723ce 100644 --- a/java/res/color/resolver_profile_tab_text.xml +++ b/java/res/color/resolver_profile_tab_text.xml @@ -16,5 +16,5 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"> <item android:color="?androidprv:attr/materialColorOnPrimary" android:state_selected="true"/> - <item android:color="?androidprv:attr/materialColorOnSecondaryContainer"/> + <item android:color="?androidprv:attr/materialColorOnSurfaceVariant"/> </selector> diff --git a/java/res/drawable/chooser_content_preview_rounded.xml b/java/res/drawable/chooser_content_preview_rounded.xml index 85dfacb9..3d6145bc 100644 --- a/java/res/drawable/chooser_content_preview_rounded.xml +++ b/java/res/drawable/chooser_content_preview_rounded.xml @@ -21,7 +21,7 @@ android:shape="rectangle"> <solid - android:color="?androidprv:attr/materialColorSurfaceDim" /> + android:color="?androidprv:attr/materialColorSurfaceBright" /> <corners android:radius="16dp" /> diff --git a/java/res/drawable/content_preview_badge_bg.xml b/java/res/drawable/content_preview_badge_bg.xml index 51caef5f..7f7a1c6f 100644 --- a/java/res/drawable/content_preview_badge_bg.xml +++ b/java/res/drawable/content_preview_badge_bg.xml @@ -21,7 +21,7 @@ android:type="radial" android:centerX="1" android:centerY="0" - android:gradientRadius="@dimen/chooser_preview_image_width" + android:gradientRadius="@dimen/chooser_preview_image_height_tall" android:startColor="#60000000" android:endColor="#00000000" /> </shape> diff --git a/java/res/drawable/ic_file_copy.xml b/java/res/drawable/ic_file_copy.xml index d05b55f1..0667e474 100644 --- a/java/res/drawable/ic_file_copy.xml +++ b/java/res/drawable/ic_file_copy.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> <path - android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5l6,6v10c0,1.1 -0.9,2 -2,2L7.99,23C6.89,23 6,22.1 6,21l0.01,-14c0,-1.1 0.89,-2 1.99,-2h7zM14,12h5.5L14,6.5L14,12z" + android:pathData="m19.5,19l-11,0c-0.55,0 -1.03,-0.19 -1.42,-0.57c-0.39,-0.41 -0.58,-0.88 -0.58,-1.43l0,-14c0,-0.55 0.19,-1.02 0.58,-1.4c0.39,-0.4 0.87,-0.6 1.42,-0.6l7,0l6,6l0,10c0,0.55 -0.2,1.02 -0.6,1.43c-0.38,0.38 -0.85,0.57 -1.4,0.57zm-5,-11l0,-5l-6,0l0,14l11,0l0,-9l-5,0zm-10,15c-0.55,0 -1.02,-0.19 -1.42,-0.57c-0.39,-0.41 -0.58,-0.88 -0.58,-1.43l0,-14l2,0l0,14l11,0l0,2l-11,0zm4,-20l0,5l0,-5l0,5l0,9l0,-14z" android:fillColor="@android:color/white"/> </vector> diff --git a/java/res/drawable/resolver_profile_tab_bg.xml b/java/res/drawable/resolver_profile_tab_bg.xml index dba06a7f..8bb23a53 100644 --- a/java/res/drawable/resolver_profile_tab_bg.xml +++ b/java/res/drawable/resolver_profile_tab_bg.xml @@ -29,7 +29,7 @@ <item android:state_selected="false"> <shape android:shape="rectangle"> <corners android:radius="12dp" /> - <solid android:color="?androidprv:attr/materialColorSecondaryContainer" /> + <solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest" /> </shape> </item> diff --git a/java/res/drawable/single_file.xml b/java/res/drawable/single_file.xml new file mode 100644 index 00000000..af46c97e --- /dev/null +++ b/java/res/drawable/single_file.xml @@ -0,0 +1,25 @@ +<!-- + Copyright (C) 2019 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="24dp" + android:height="24dp" + android:tint="@*android:color/material_grey_600" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:pathData="m6,22c-0.55,0 -1.02,-0.19 -1.42,-0.57c-0.39,-0.41 -0.58,-0.88 -0.58,-1.43l0,-16c0,-0.55 0.19,-1.02 0.58,-1.4c0.39,-0.4 0.87,-0.6 1.42,-0.6l8,0l6,6l0,12c0,0.55 -0.2,1.02 -0.6,1.43c-0.38,0.38 -0.85,0.57 -1.4,0.57l-12,0zm7,-13l0,-5l-7,0l0,16l12,0l0,-11l-5,0zm-7,-5l0,5l0,-5l0,5l0,11l0,-16z" + android:fillColor="@android:color/white"/> +</vector> diff --git a/java/res/layout/chooser_action_row.xml b/java/res/layout/chooser_action_row.xml index bdf42211..4a3df79e 100644 --- a/java/res/layout/chooser_action_row.xml +++ b/java/res/layout/chooser_action_row.xml @@ -23,7 +23,7 @@ android:id="@+id/actions_top_divider" android:layout_width="match_parent" android:layout_height="2dp" - android:background="?androidprv:attr/materialColorSurfaceDim" + android:background="?androidprv:attr/materialColorSurfaceContainerHighest" /> <com.android.intentresolver.widget.ScrollableActionRow @@ -37,7 +37,7 @@ <View android:layout_width="match_parent" android:layout_height="2dp" - android:background="?androidprv:attr/materialColorSurfaceDim" + android:background="?androidprv:attr/materialColorSurfaceContainerHighest" /> </merge> diff --git a/java/res/layout/chooser_action_view.xml b/java/res/layout/chooser_action_view.xml index ec1b0687..8bdcd15f 100644 --- a/java/res/layout/chooser_action_view.xml +++ b/java/res/layout/chooser_action_view.xml @@ -15,16 +15,16 @@ --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" - android:gravity="center" - android:drawablePadding="8dp" - android:textColor="?androidprv:attr/materialColorOnSurface" - android:textSize="12sp" - android:maxWidth="@dimen/chooser_action_max_width" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + style="?android:attr/borderlessButtonStyle" + android:paddingVertical="16dp" android:clickable="true" + android:drawablePadding="8dp" android:drawableTint="?androidprv:attr/materialColorOnSurfaceVariant" android:drawableTintMode="src_in" android:ellipsize="end" + android:gravity="center" android:maxLines="2" - style="?android:attr/borderlessButtonStyle" - /> + android:maxWidth="@dimen/chooser_action_max_width" + android:textColor="?androidprv:attr/materialColorOnSurface" + android:textSize="12sp" /> diff --git a/java/res/layout/chooser_grid_preview_text.xml b/java/res/layout/chooser_grid_preview_text.xml index 1a4404a4..44163b49 100644 --- a/java/res/layout/chooser_grid_preview_text.xml +++ b/java/res/layout/chooser_grid_preview_text.xml @@ -20,6 +20,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@androidprv:id/content_preview_text_area" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -35,20 +36,20 @@ android:layout_marginLeft="@dimen/chooser_edge_margin_normal" android:layout_marginRight="@dimen/chooser_edge_margin_normal" android:layout_marginBottom="@dimen/chooser_view_spacing" - android:padding="@dimen/chooser_edge_margin_normal" + android:padding="@dimen/chooser_edge_margin_normal_half" android:background="@drawable/chooser_content_preview_rounded" android:id="@+id/text_preview_layout"> - <ImageView + <com.android.intentresolver.widget.RoundedRectImageView android:id="@androidprv:id/content_preview_thumbnail" - android:layout_width="48dp" - android:layout_height="48dp" + android:layout_width="@dimen/width_text_image_preview_size" + android:layout_height="@dimen/width_text_image_preview_size" android:layout_alignParentStart="true" - android:layout_alignParentTop="true" - android:layout_marginEnd="@dimen/chooser_edge_margin_normal" + android:layout_centerVertical="true" + android:layout_marginEnd="@dimen/chooser_edge_margin_normal_half" android:adjustViewBounds="true" - android:layout_gravity="center_vertical" android:gravity="center" + app:radius="@dimen/chooser_corner_radius_small" android:scaleType="centerCrop"/> <TextView diff --git a/java/res/values-h480dp/bools.xml b/java/res/values-h480dp/bools.xml index 749f7e8c..761de1ea 100644 --- a/java/res/values-h480dp/bools.xml +++ b/java/res/values-h480dp/bools.xml @@ -17,5 +17,4 @@ <resources> <bool name="horizontal_actions">false</bool> - <bool name="minimal_preview">false</bool> </resources> diff --git a/java/res/values-h480dp/dimens.xml b/java/res/values-h480dp/dimens.xml index 3d9e72b8..369a32b8 100644 --- a/java/res/values-h480dp/dimens.xml +++ b/java/res/values-h480dp/dimens.xml @@ -24,7 +24,7 @@ <dimen name="chooser_preview_width">-1px</dimen> <dimen name="chooser_view_spacing">18dp</dimen> <dimen name="chooser_action_max_width">80dp</dimen> - <dimen name="width_text_image_preview_size">100dp</dimen> <dimen name="chooser_preview_image_height_tall">192dp</dimen> - <dimen name="grid_padding_top">24dp</dimen> + <dimen name="grid_padding_top">10dp</dimen> + <dimen name="width_text_image_preview_size">56dp</dimen> </resources> diff --git a/java/res/values/bools.xml b/java/res/values/bools.xml index 38d97d8e..fb6db549 100644 --- a/java/res/values/bools.xml +++ b/java/res/values/bools.xml @@ -18,5 +18,4 @@ <!-- Note that these values are for landscape phones, the values for all screens taller than 480dp are set in values-h480dp/bools.xml --> <bool name="horizontal_actions">true</bool> - <bool name="minimal_preview">true</bool> </resources> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index 30b788a9..6da0ec1c 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -58,8 +58,8 @@ <dimen name="chooser_preview_width">412dp</dimen> <dimen name="chooser_view_spacing">8dp</dimen> <dimen name="chooser_action_max_width">120dp</dimen> - <dimen name="width_text_image_preview_size">32dp</dimen> <dimen name="chooser_preview_image_height_tall">64dp</dimen> - <dimen name="grid_padding_top">8dp</dimen> + <dimen name="grid_padding_top">6dp</dimen> + <dimen name="width_text_image_preview_size">46dp</dimen> <!-- END SECTION --> </resources> diff --git a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java index 85f94451..13f27493 100644 --- a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java +++ b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java @@ -22,6 +22,7 @@ import android.util.PluralsMessageFormatter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.TextView; import com.android.intentresolver.R; @@ -91,6 +92,8 @@ class FileContentPreviewUi extends ContentPreviewUi { secondLine.setText( PluralsMessageFormatter.format(resources, arguments, R.string.more_files)); } else { + ImageView icon = contentPreviewLayout.findViewById(R.id.content_preview_file_icon); + icon.setImageResource(R.drawable.single_file); secondLine.setVisibility(View.GONE); } diff --git a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java index 363508b7..4fe54681 100644 --- a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java +++ b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java @@ -181,7 +181,6 @@ class FilesPlusTextContentPreviewUi extends ContentPreviewUi { includeText.setText(isLink ? R.string.include_link : R.string.include_text); shareTextAction.accept(false); includeText.setOnCheckedChangeListener((view, isChecked) -> { - textView.setEnabled(isChecked); if (isChecked) { textView.setText(mText); } else { diff --git a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java index c429b2d6..3c8a6e48 100644 --- a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java +++ b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java @@ -79,9 +79,6 @@ class TextContentPreviewUi extends ContentPreviewUi { ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate( R.layout.chooser_grid_preview_text, parent, false); - boolean minimalPreview = - parent.getContext().getResources().getBoolean(R.bool.minimal_preview); - final ActionRow actionRow = contentPreviewLayout.findViewById(com.android.internal.R.id.chooser_action_row); actionRow.setActions( @@ -108,7 +105,7 @@ class TextContentPreviewUi extends ContentPreviewUi { TextView previewTitleView = contentPreviewLayout.findViewById( com.android.internal.R.id.content_preview_title); - if (TextUtils.isEmpty(mPreviewTitle) || minimalPreview) { + if (TextUtils.isEmpty(mPreviewTitle)) { previewTitleView.setVisibility(View.GONE); } else { previewTitleView.setText(mPreviewTitle); @@ -116,7 +113,7 @@ class TextContentPreviewUi extends ContentPreviewUi { ImageView previewThumbnailView = contentPreviewLayout.findViewById( com.android.internal.R.id.content_preview_thumbnail); - if (!isOwnedByCurrentUser(mPreviewThumbnail) || minimalPreview) { + if (!isOwnedByCurrentUser(mPreviewThumbnail)) { previewThumbnailView.setVisibility(View.GONE); } else { mImageLoader.loadImage( diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java index 5ea0b47d..317e2815 100644 --- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java +++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java @@ -26,7 +26,6 @@ import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist; import static androidx.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.matcher.ViewMatchers.hasSibling; import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; -import static androidx.test.espresso.matcher.ViewMatchers.isEnabled; import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; import static androidx.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withText; @@ -855,7 +854,7 @@ public class UnbundledChooserActivityTest { onView(withId(R.id.image_view)) .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE))); onView(withId(R.id.content_preview_text)) - .check(matches(allOf(isDisplayed(), not(isEnabled()), withText("Image only")))); + .check(matches(allOf(isDisplayed(), withText("Image only")))); } @Test |