diff options
author | Richard Chou <richardchou@google.com> | 2019-01-30 06:37:48 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-01-30 06:37:48 +0000 |
commit | ed09a9df3e86622e91a2fb936877af5a147b2395 (patch) | |
tree | 678484326bb5eebef2cafff729e646e1316fdc26 /res | |
parent | 4bc15c7ed1c06f852afa8425b971fb658ed063ff (diff) | |
parent | 00e8d9afba8bd20bc73e9507e0e42d6f9962ceef (diff) | |
download | android_packages_wallpapers_LivePicker-ed09a9df3e86622e91a2fb936877af5a147b2395.tar.gz android_packages_wallpapers_LivePicker-ed09a9df3e86622e91a2fb936877af5a147b2395.tar.bz2 android_packages_wallpapers_LivePicker-ed09a9df3e86622e91a2fb936877af5a147b2395.zip |
Merge "Supports inline control for live wallpapers"
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/btn_outlined_material.xml | 22 | ||||
-rw-r--r-- | res/drawable/btn_outlined_mtrl_shape.xml | 33 | ||||
-rw-r--r-- | res/layout/live_wallpaper_preview.xml | 107 | ||||
-rw-r--r-- | res/layout/page_info.xml | 88 | ||||
-rw-r--r-- | res/layout/page_settings.xml | 36 | ||||
-rw-r--r-- | res/menu/menu_preview.xml | 6 | ||||
-rw-r--r-- | res/values-sw720dp/dimes.xml | 11 | ||||
-rw-r--r-- | res/values-sw720dp/styles.xml | 21 | ||||
-rw-r--r-- | res/values/dimensions.xml | 26 | ||||
-rw-r--r-- | res/values/strings.xml | 14 | ||||
-rw-r--r-- | res/values/styles.xml | 32 |
11 files changed, 253 insertions, 143 deletions
diff --git a/res/drawable/btn_outlined_material.xml b/res/drawable/btn_outlined_material.xml new file mode 100644 index 0000000..7e26ea5 --- /dev/null +++ b/res/drawable/btn_outlined_material.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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. +--> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?android:attr/colorControlHighlight"> + <item android:id="@android:id/mask" + android:drawable="@*android:drawable/btn_default_mtrl_shape"/> + <item android:drawable="@drawable/btn_outlined_mtrl_shape"/> +</ripple> diff --git a/res/drawable/btn_outlined_mtrl_shape.xml b/res/drawable/btn_outlined_mtrl_shape.xml new file mode 100644 index 0000000..bc6cff2 --- /dev/null +++ b/res/drawable/btn_outlined_mtrl_shape.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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. +--> + +<!-- Used as the canonical button shape. --> + +<inset xmlns:android="http://schemas.android.com/apk/res/android" + android:insetLeft="@*android:dimen/button_inset_horizontal_material" + android:insetTop="@*android:dimen/button_inset_vertical_material" + android:insetRight="@*android:dimen/button_inset_horizontal_material" + android:insetBottom="@*android:dimen/button_inset_vertical_material"> + <shape android:shape="rectangle"> + <corners android:radius="?android:attr/buttonCornerRadius"/> + <padding android:bottom="@*android:dimen/button_padding_vertical_material" + android:left="@*android:dimen/button_padding_horizontal_material" + android:right="@*android:dimen/button_padding_horizontal_material" + android:top="@*android:dimen/button_padding_vertical_material"/> + <stroke android:width="@dimen/btn_outlined_stroke" + android:color="@*android:color/primary_device_default_light"/> + </shape> +</inset> diff --git a/res/layout/live_wallpaper_preview.xml b/res/layout/live_wallpaper_preview.xml index 5eb486f..ca6af3e 100644 --- a/res/layout/live_wallpaper_preview.xml +++ b/res/layout/live_wallpaper_preview.xml @@ -27,7 +27,7 @@ android:forceHasOverlappingRendering="false"> <ProgressBar - style="@android:style/Widget.Material.ProgressBar" + style="@android:style/Widget.DeviceDefault.ProgressBar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" @@ -35,102 +35,45 @@ </FrameLayout> - <FrameLayout android:layout_width="match_parent" + <FrameLayout + android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true"> - <androidx.coordinatorlayout.widget.CoordinatorLayout - android:id="@+id/coordinator_layout" + <LinearLayout + android:id="@+id/bottom_pane" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="bottom"> + android:layout_gravity="bottom" + android:background="@color/translucent_black" + android:orientation="vertical"> - <RelativeLayout android:id="@+id/bottom_sheet" + <android.support.design.widget.TabLayout + android:id="@+id/tablayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:minHeight="@dimen/preview_attribution_pane_expanded_height" - android:orientation="vertical" - android:background="@color/translucent_black" - app:behavior_peekHeight="@dimen/preview_attribution_pane_collapsed_height" - app:layout_behavior="android.support.design.widget.BottomSheetBehavior"> - - <ImageButton android:id="@+id/preview_attribution_pane_arrow" - android:contentDescription="@string/expand_attribution_panel" - android:layout_width="48dp" - android:layout_height="48dp" - android:layout_alignParentEnd="true" - android:focusable="true" - android:clickable="true" - android:src="@drawable/ic_keyboard_arrow_up_white_24dp" - style="?android:attr/borderlessButtonStyle"/> - - <TextView - android:id="@+id/preview_attribution_pane_title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="start" - android:layout_marginStart="@dimen/preview_attribution_pane_content_side_margin" - android:layout_marginEnd="@dimen/preview_attribution_pane_content_side_margin" - android:layout_marginTop="@dimen/preview_attribution_pane_title_top_margin" - android:layout_toStartOf="@id/preview_attribution_pane_arrow" - android:ellipsize="end" - android:textAppearance="@style/AttributionPaneTitle" - android:forceHasOverlappingRendering="false"/> - - <TextView android:id="@+id/preview_attribution_pane_subtitle1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/preview_attribution_pane_content_side_margin" - android:layout_marginEnd="@dimen/preview_attribution_pane_content_side_margin" - android:layout_marginTop="@dimen/preview_attribution_pane_subtitle1_top_margin" - android:layout_below="@id/preview_attribution_pane_title" - android:layout_toStartOf="@id/preview_attribution_pane_arrow" - android:textAppearance="@android:style/TextAppearance.Material.Body1" - android:forceHasOverlappingRendering="false"/> + app:tabTextAppearance="@style/LivePicker.TextAppearance.Tab.NoAllCaps" + app:tabIndicatorColor="?android:attr/textColorPrimary" + android:visibility="gone"/> - <TextView android:id="@+id/preview_attribution_pane_subtitle2" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textSize="@dimen/abc_text_size_caption_material" - android:layout_marginStart="@dimen/preview_attribution_pane_content_side_margin" - android:layout_marginEnd="@dimen/preview_attribution_pane_content_side_margin" - android:layout_marginTop="@dimen/preview_attribution_pane_subtitle2_top_margin" - android:layout_below="@id/preview_attribution_pane_subtitle1" - android:layout_toStartOf="@id/preview_attribution_pane_arrow" - android:textAppearance="@android:style/TextAppearance.Material.Caption" - android:forceHasOverlappingRendering="false"/> - - <Button android:id="@+id/preview_attribution_pane_explore_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="?android:attr/colorAccent" - android:layout_marginLeft="@dimen/preview_attribution_pane_explore_left_margin" - android:layout_marginStart="@dimen/preview_attribution_pane_explore_left_margin" - android:layout_marginTop="@dimen/preview_attribution_pane_explore_top_margin" - android:layout_marginBottom="@dimen/preview_attribution_pane_explore_bottom_margin" - android:layout_below="@id/preview_attribution_pane_subtitle2" - android:layout_gravity="center_vertical" - style="?android:attr/borderlessButtonStyle" - android:forceHasOverlappingRendering="false"/> - - <View android:id="@id/spacer" - android:layout_width="match_parent" - android:layout_height="@dimen/preview_attribution_pane_spacer_height" - android:layout_below="@id/preview_attribution_pane_subtitle2" - android:visibility="gone"/> + <com.android.wallpaper.livepicker.widget.ConstraintViewPager + android:id="@+id/viewpager" + android:layout_width="match_parent" + android:layout_height="wrap_content"> - </RelativeLayout> + </com.android.wallpaper.livepicker.widget.ConstraintViewPager> - </androidx.coordinatorlayout.widget.CoordinatorLayout> + </LinearLayout> - <android.widget.Toolbar android:id="@+id/toolbar" + <android.widget.Toolbar + android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="top" - android:paddingStart="@dimen/preview_toolbar_up_button_padding" - android:paddingEnd="@dimen/preview_toolbar_set_wallpaper_button_end_padding" - style="@style/TranslucentToolbarStyle"/> + style="@style/TranslucentToolbarStyle" + android:paddingStart="@dimen/preview_toolbar_start_padding" + android:paddingEnd="@dimen/preview_toolbar_end_padding"/> </FrameLayout> + </FrameLayout> diff --git a/res/layout/page_info.xml b/res/layout/page_info.xml new file mode 100644 index 0000000..33a11bf --- /dev/null +++ b/res/layout/page_info.xml @@ -0,0 +1,88 @@ +<!-- 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. +--> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:paddingHorizontal="@dimen/preview_attribution_pane_horizontal_padding" + android:paddingVertical="@dimen/preview_attribution_pane_vertical_padding"> + + <TextView + android:id="@+id/preview_attribution_pane_title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="start" + android:ellipsize="end" + android:forceHasOverlappingRendering="false" + android:gravity="center_horizontal" + android:singleLine="true" + android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large" + android:textSize="@dimen/abc_text_size_subhead_material" + android:visibility="gone"/> + + <TextView + android:id="@+id/preview_attribution_pane_author" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/preview_attribution_pane_author_top_margin" + android:forceHasOverlappingRendering="false" + android:gravity="center_horizontal" + android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small" + android:textColor="?android:attr/textColorPrimary" + android:visibility="gone"/> + + <TextView + android:id="@+id/preview_attribution_pane_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/preview_attribution_pane_description_top_margin" + android:forceHasOverlappingRendering="false" + android:gravity="center_horizontal" + android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small" + android:textSize="@dimen/abc_text_size_caption_material" + android:visibility="gone"/> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:layout_marginTop="@dimen/preview_attribution_pane_explore_top_margin" + android:orientation="horizontal"> + + <Button + android:id="@+id/preview_attribution_pane_explore_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/LivePicker.Button.Outlined" + android:text="@string/explore_further" + android:visibility="gone"/> + + <Space + android:id="@+id/spacer" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1" + android:visibility="gone"/> + + <Button + android:id="@+id/preview_attribution_pane_set_wallpaper_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/LivePicker.Button.Colored" + android:text="@string/set_live_wallpaper"/> + + </LinearLayout> + +</LinearLayout> diff --git a/res/layout/page_settings.xml b/res/layout/page_settings.xml new file mode 100644 index 0000000..bc8c2ff --- /dev/null +++ b/res/layout/page_settings.xml @@ -0,0 +1,36 @@ +<!-- 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. +--> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:gravity="center_horizontal" + android:orientation="vertical" + android:paddingHorizontal="@dimen/preview_attribution_pane_horizontal_padding" + android:paddingVertical="@dimen/preview_attribution_pane_vertical_padding"> + + <androidx.slice.widget.SliceView + android:id="@+id/settings_slice" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <Button + android:id="@+id/preview_attribution_pane_set_wallpaper_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/preview_attribution_pane_explore_top_margin" + style="@style/LivePicker.Button.Colored" + android:text="@string/set_live_wallpaper"/> + +</LinearLayout> diff --git a/res/menu/menu_preview.xml b/res/menu/menu_preview.xml index 87d17c9..c8d450a 100644 --- a/res/menu/menu_preview.xml +++ b/res/menu/menu_preview.xml @@ -23,12 +23,6 @@ android:title="@string/configure_wallpaper"/> <item - android:id="@+id/set_wallpaper" - android:title="@string/set_live_wallpaper" - android:showAsAction="always|withText" - android:actionLayout="@layout/set_wallpaper_action"/> - - <item android:id="@+id/delete_wallpaper" android:icon="@drawable/ic_delete_white_24dp" android:showAsAction="ifRoom" diff --git a/res/values-sw720dp/dimes.xml b/res/values-sw720dp/dimes.xml index 54380b9..f4e7b9c 100644 --- a/res/values-sw720dp/dimes.xml +++ b/res/values-sw720dp/dimes.xml @@ -16,12 +16,11 @@ <resources> - <!-- Dimensions for the preview fragment. --> - <dimen name="preview_toolbar_up_button_padding">8dp</dimen> - <dimen name="preview_toolbar_set_wallpaper_button_padding">20dp</dimen> + <!-- Dimensions for the toolbar. --> + <dimen name="preview_toolbar_start_padding">8dp</dimen> + <dimen name="preview_toolbar_end_padding">20dp</dimen> <!-- Dimensions for the preview attribution pane. --> - <dimen name="preview_attribution_pane_content_side_margin">24dp</dimen> - <dimen name="preview_attribution_pane_explore_left_margin">10dp</dimen> + <dimen name="preview_attribution_pane_horizontal_padding">24dp</dimen> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml deleted file mode 100644 index 7e1209c..0000000 --- a/res/values-sw720dp/styles.xml +++ /dev/null @@ -1,21 +0,0 @@ -<!-- - ~ 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 - --> - -<resources> - - <style name="AttributionPaneTitle" parent="@android:style/TextAppearance.Material.Headline"/> - -</resources>
\ No newline at end of file diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index 73792df..528901b 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -25,19 +25,21 @@ <dimen name="screen_margin_sides">0dip</dimen> - <!-- Dimensions for the preview fragment. --> - <dimen name="preview_toolbar_up_button_padding">0dp</dimen> - <dimen name="preview_toolbar_set_wallpaper_button_end_padding">12dp</dimen> + <!-- Dimensions for the toolbar. --> + <dimen name="preview_toolbar_start_padding">0dp</dimen> + <dimen name="preview_toolbar_end_padding">12dp</dimen> <!-- Dimensions for the preview attribution pane. --> - <dimen name="preview_attribution_pane_collapsed_height">48dp</dimen> - <dimen name="preview_attribution_pane_expanded_height">96dp</dimen> - <dimen name="preview_attribution_pane_content_side_margin">16dp</dimen> - <dimen name="preview_attribution_pane_title_top_margin">13dp</dimen> - <dimen name="preview_attribution_pane_subtitle1_top_margin">12dp</dimen> - <dimen name="preview_attribution_pane_subtitle2_top_margin">2dp</dimen> - <dimen name="preview_attribution_pane_explore_left_margin">2dp</dimen> + <dimen name="preview_attribution_pane_horizontal_padding">16dp</dimen> + <dimen name="preview_attribution_pane_vertical_padding">13dp</dimen> + <dimen name="preview_attribution_pane_author_top_margin">12dp</dimen> + <dimen name="preview_attribution_pane_description_top_margin">2dp</dimen> <dimen name="preview_attribution_pane_explore_top_margin">12dp</dimen> - <dimen name="preview_attribution_pane_explore_bottom_margin">16dp</dimen> - <dimen name="preview_attribution_pane_spacer_height">32dp</dimen> + + <!-- Dimensions for the ConstraintViewPager on preview activity. --> + <dimen name="preview_viewpager_round_radius">12dp</dimen> + + <!-- Dimensions for the button. --> + <dimen name="btn_corner_radius">4dp</dimen> + <dimen name="btn_outlined_stroke">1dp</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 0206a43..0247731 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -49,11 +49,13 @@ <!-- Option for setting the wallpaper on both the home screen and lock screen. --> <string name="which_wallpaper_option_home_screen_and_lock_screen">Home screen and lock screen</string> - <!-- Content description for a button letting the user collapse a visual panel showing info - about the wallpaper being previewed. [CHAR LIMIT=none] --> - <string name="collapse_attribution_panel">Collapse wallpaper info panel</string> + <!-- Button label on attribution panel, explores further context about the wallpaper. + [CHAR_LIMIT=15] --> + <string name="explore_further">Explore</string> - <!-- Content description for a button letting the user expand a visual panel showing info about - the wallpaper being previewed. [CHAR LIMIT=none] --> - <string name="expand_attribution_panel">Expand wallpaper info panel</string> + <!-- Label for the 'Info' tab of view pager in wallpaper preview activity. [CHAR_LIMIT=25] --> + <string name="tab_info">Info</string> + <!-- Label for the 'Customize' tab of view pager in wallpaper preview activity. + [CHAR_LIMIT=25] --> + <string name="tab_customize">Customize</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index c3dc2b3..48f50bc 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -21,21 +21,19 @@ <style name="LivePickerTheme" parent="@android:style/Theme.DeviceDefault.Settings" /> - <style name="Preview" parent="@style/Theme.AppCompat"> - - <!-- Set no title and no action bar because we use a toolbar instead. --> - <item name="android:windowActionBar">false</item> - <item name="android:windowNoTitle">true</item> + <style name="Preview" parent="@style/Theme.AppCompat.NoActionBar"> <item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowContentOverlay">@null</item> + <item name="android:windowDisablePreview">true</item> <!-- Set status bar and navigation buttons to be translucent. --> - <item name="android:colorPrimaryDark">@color/translucent_black</item> + <item name="android:statusBarColor">@color/translucent_black</item> <item name="android:navigationBarColor">@color/translucent_black</item> - <item name="colorAccent">@*android:color/accent_device_default_dark</item> + <item name="android:colorAccent">@*android:color/accent_device_default_light</item> + <item name="colorAccent">@*android:color/accent_device_default_light</item> - <item name="android:windowDisablePreview">true</item> + <item name="android:buttonCornerRadius">@dimen/btn_corner_radius</item> </style> <style name="TranslucentToolbarStyle" parent="@style/Widget.AppCompat.Toolbar"> @@ -43,6 +41,20 @@ <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> </style> - <style name="AttributionPaneTitle" parent="@android:style/TextAppearance.Material.Subhead"/> + <style name="LivePicker.TextAppearance.Tab.NoAllCaps" + parent="@android:style/TextAppearance.DeviceDefault.Widget.TabWidget"> + <item name="android:textAllCaps">false</item> + </style> + + <style name="LivePicker.Button.Colored" + parent="@android:style/Widget.DeviceDefault.Button.Colored"> + <item name="android:textColor">?android:textColorPrimary</item> + <item name="android:textAllCaps">false</item> + <item name="android:stateListAnimator">@null</item> + </style> + + <style name="LivePicker.Button.Outlined" parent="@style/LivePicker.Button.Colored"> + <item name="android:background">@drawable/btn_outlined_material</item> + </style> -</resources>
\ No newline at end of file +</resources> |