diff options
| author | Pierre-Louis <plg@google.com> | 2021-04-20 21:22:58 +0200 |
|---|---|---|
| committer | Pierre-Louis <plg@google.com> | 2021-04-20 23:41:52 +0200 |
| commit | 2006ab7027361e21c317eef38c91abaf751390e7 (patch) | |
| tree | 5845021dee074eea78038464ee38d2d8a2cd917e | |
| parent | 6634b370ebc0bfd15c34456e33b00e3102d7d713 (diff) | |
| download | platform_packages_apps_WallpaperPicker2-2006ab7027361e21c317eef38c91abaf751390e7.tar.gz platform_packages_apps_WallpaperPicker2-2006ab7027361e21c317eef38c91abaf751390e7.tar.bz2 platform_packages_apps_WallpaperPicker2-2006ab7027361e21c317eef38c91abaf751390e7.zip | |
Remove unused resources
Generated with Android Studio. strings.xml files are excluded. Moved tab_text_color here.
Test: build pass
Bug: 185360060
Change-Id: Ic3e9c70b7d3926b7e9397debb2c2e6bc0debf40c
52 files changed, 24 insertions, 811 deletions
diff --git a/res/color/tab_text_color.xml b/res/color/tab_text_color.xml new file mode 100644 index 0000000..70b364a --- /dev/null +++ b/res/color/tab_text_color.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_enabled="false" android:color="?android:textColorTertiary"/> + <item android:color="?android:textColorSecondary"/> +</selector>
\ No newline at end of file diff --git a/res/color/toolbar_icon_color.xml b/res/color/toolbar_icon_color.xml deleted file mode 100644 index 91e56c1..0000000 --- a/res/color/toolbar_icon_color.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2021 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. ---> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="?android:textColorPrimary"/> -</selector> diff --git a/res/drawable-hdpi/material_ic_check_circle_white_24.png b/res/drawable-hdpi/material_ic_check_circle_white_24.png Binary files differdeleted file mode 100755 index e190a5c..0000000 --- a/res/drawable-hdpi/material_ic_check_circle_white_24.png +++ /dev/null diff --git a/res/drawable-hdpi/material_ic_keyboard_arrow_down_black_24.png b/res/drawable-hdpi/material_ic_keyboard_arrow_down_black_24.png Binary files differdeleted file mode 100755 index ce5c909..0000000 --- a/res/drawable-hdpi/material_ic_keyboard_arrow_down_black_24.png +++ /dev/null diff --git a/res/drawable-hdpi/material_ic_keyboard_arrow_up_black_24.png b/res/drawable-hdpi/material_ic_keyboard_arrow_up_black_24.png Binary files differdeleted file mode 100755 index 2886c1b..0000000 --- a/res/drawable-hdpi/material_ic_keyboard_arrow_up_black_24.png +++ /dev/null diff --git a/res/drawable-hdpi/material_ic_wallpaper_white_48.png b/res/drawable-hdpi/material_ic_wallpaper_white_48.png Binary files differdeleted file mode 100755 index 87fc61e..0000000 --- a/res/drawable-hdpi/material_ic_wallpaper_white_48.png +++ /dev/null diff --git a/res/drawable-mdpi/material_ic_check_circle_white_24.png b/res/drawable-mdpi/material_ic_check_circle_white_24.png Binary files differdeleted file mode 100755 index bc77b2e..0000000 --- a/res/drawable-mdpi/material_ic_check_circle_white_24.png +++ /dev/null diff --git a/res/drawable-mdpi/material_ic_keyboard_arrow_down_black_24.png b/res/drawable-mdpi/material_ic_keyboard_arrow_down_black_24.png Binary files differdeleted file mode 100755 index 6318c50..0000000 --- a/res/drawable-mdpi/material_ic_keyboard_arrow_down_black_24.png +++ /dev/null diff --git a/res/drawable-mdpi/material_ic_keyboard_arrow_up_black_24.png b/res/drawable-mdpi/material_ic_keyboard_arrow_up_black_24.png Binary files differdeleted file mode 100755 index 31ddbb6..0000000 --- a/res/drawable-mdpi/material_ic_keyboard_arrow_up_black_24.png +++ /dev/null diff --git a/res/drawable-mdpi/material_ic_wallpaper_white_48.png b/res/drawable-mdpi/material_ic_wallpaper_white_48.png Binary files differdeleted file mode 100755 index 2595f7a..0000000 --- a/res/drawable-mdpi/material_ic_wallpaper_white_48.png +++ /dev/null diff --git a/res/drawable-xhdpi/material_ic_check_circle_white_24.png b/res/drawable-xhdpi/material_ic_check_circle_white_24.png Binary files differdeleted file mode 100755 index d36d696..0000000 --- a/res/drawable-xhdpi/material_ic_check_circle_white_24.png +++ /dev/null diff --git a/res/drawable-xhdpi/material_ic_keyboard_arrow_down_black_24.png b/res/drawable-xhdpi/material_ic_keyboard_arrow_down_black_24.png Binary files differdeleted file mode 100755 index 1b0acc2..0000000 --- a/res/drawable-xhdpi/material_ic_keyboard_arrow_down_black_24.png +++ /dev/null diff --git a/res/drawable-xhdpi/material_ic_keyboard_arrow_up_black_24.png b/res/drawable-xhdpi/material_ic_keyboard_arrow_up_black_24.png Binary files differdeleted file mode 100755 index 016eabd..0000000 --- a/res/drawable-xhdpi/material_ic_keyboard_arrow_up_black_24.png +++ /dev/null diff --git a/res/drawable-xhdpi/material_ic_wallpaper_white_48.png b/res/drawable-xhdpi/material_ic_wallpaper_white_48.png Binary files differdeleted file mode 100755 index 07ba529..0000000 --- a/res/drawable-xhdpi/material_ic_wallpaper_white_48.png +++ /dev/null diff --git a/res/drawable-xxhdpi/material_ic_check_circle_white_24.png b/res/drawable-xxhdpi/material_ic_check_circle_white_24.png Binary files differdeleted file mode 100755 index 4f96745..0000000 --- a/res/drawable-xxhdpi/material_ic_check_circle_white_24.png +++ /dev/null diff --git a/res/drawable-xxhdpi/material_ic_keyboard_arrow_down_black_24.png b/res/drawable-xxhdpi/material_ic_keyboard_arrow_down_black_24.png Binary files differdeleted file mode 100755 index d7b706e..0000000 --- a/res/drawable-xxhdpi/material_ic_keyboard_arrow_down_black_24.png +++ /dev/null diff --git a/res/drawable-xxhdpi/material_ic_keyboard_arrow_up_black_24.png b/res/drawable-xxhdpi/material_ic_keyboard_arrow_up_black_24.png Binary files differdeleted file mode 100755 index ba836b8..0000000 --- a/res/drawable-xxhdpi/material_ic_keyboard_arrow_up_black_24.png +++ /dev/null diff --git a/res/drawable-xxhdpi/material_ic_wallpaper_white_48.png b/res/drawable-xxhdpi/material_ic_wallpaper_white_48.png Binary files differdeleted file mode 100755 index 4275a45..0000000 --- a/res/drawable-xxhdpi/material_ic_wallpaper_white_48.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/material_ic_check_circle_white_24.png b/res/drawable-xxxhdpi/material_ic_check_circle_white_24.png Binary files differdeleted file mode 100755 index 2c6e474..0000000 --- a/res/drawable-xxxhdpi/material_ic_check_circle_white_24.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/material_ic_keyboard_arrow_down_black_24.png b/res/drawable-xxxhdpi/material_ic_keyboard_arrow_down_black_24.png Binary files differdeleted file mode 100755 index 5b055c2..0000000 --- a/res/drawable-xxxhdpi/material_ic_keyboard_arrow_down_black_24.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/material_ic_keyboard_arrow_up_black_24.png b/res/drawable-xxxhdpi/material_ic_keyboard_arrow_up_black_24.png Binary files differdeleted file mode 100755 index c0ce888..0000000 --- a/res/drawable-xxxhdpi/material_ic_keyboard_arrow_up_black_24.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/material_ic_wallpaper_white_48.png b/res/drawable-xxxhdpi/material_ic_wallpaper_white_48.png Binary files differdeleted file mode 100755 index 6687162..0000000 --- a/res/drawable-xxxhdpi/material_ic_wallpaper_white_48.png +++ /dev/null diff --git a/res/drawable/ic_explore_18px.xml b/res/drawable/ic_explore_18px.xml deleted file mode 100644 index a02b439..0000000 --- a/res/drawable/ic_explore_18px.xml +++ /dev/null @@ -1,12 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="18dp" - android:height="18dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="#FF000000" - android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8s8,3.59 8,8C20,16.41 16.41,20 12,20z"/> - <path - android:fillColor="#FF000000" - android:pathData="M6.5,17.5l7.51,-3.49L17.5,6.5L9.99,9.99L6.5,17.5zM12,10.9c0.61,0 1.1,0.49 1.1,1.1s-0.49,1.1 -1.1,1.1s-1.1,-0.49 -1.1,-1.1S11.39,10.9 12,10.9z"/> -</vector> diff --git a/res/drawable/ic_home_24px.xml b/res/drawable/ic_home_24px.xml deleted file mode 100644 index 5f4c42e..0000000 --- a/res/drawable/ic_home_24px.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="#FF000000" - android:pathData="M12,3L4,9v12h16V9L12,3zM18,19h-3v-6H9v6H6v-9l6,-4.5l6,4.5V19z"/> -</vector> diff --git a/res/drawable/ic_refresh_24px.xml b/res/drawable/ic_refresh_24px.xml deleted file mode 100644 index f1d6330..0000000 --- a/res/drawable/ic_refresh_24px.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="#FF000000" - android:pathData="M13,9v2h7V4h-2v2.74C16.53,5.07 14.4,4 12,4C9.79,4 7.79,4.9 6.34,6.34S4,9.79 4,12c0,4.42 3.58,8 8,8c2.21,0 4.21,-0.9 5.66,-2.34l-1.42,-1.42C15.15,17.33 13.65,18 12,18c-3.31,0 -6,-2.69 -6,-6c0,-1.65 0.67,-3.15 1.76,-4.24C8.85,6.67 10.35,6 12,6c2.21,0 4.15,1.21 5.19,3L13,9z"/> -</vector> diff --git a/res/drawable/ic_settings.xml b/res/drawable/ic_settings.xml deleted file mode 100644 index f24a0a8..0000000 --- a/res/drawable/ic_settings.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?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. ---> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:height="24.0dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" - android:width="24.0dp" > - - <path - android:fillColor="#FFFFFFFF" - android:pathData="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z" /> - -</vector>
\ No newline at end of file diff --git a/res/drawable/ic_smartphone_24px.xml b/res/drawable/ic_smartphone_24px.xml deleted file mode 100644 index d97cef1..0000000 --- a/res/drawable/ic_smartphone_24px.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="#FF000000" - android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7z"/> -</vector> diff --git a/res/drawable/option_border_edge.xml b/res/drawable/option_border_edge.xml deleted file mode 100644 index 6d633c3..0000000 --- a/res/drawable/option_border_edge.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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. ---> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_activated="true"> - <shape android:shape="rectangle"> - <stroke - android:color="@color/option_border_color" - android:width="@dimen/option_selected_border_width" /> - <corners android:radius="?android:dialogCornerRadius" /> - </shape> - </item> - <item android:state_activated="false"> - <shape android:shape="rectangle"> - <stroke - android:color="@color/option_border_color" - android:width="@dimen/option_border_width" /> - <corners android:radius="?android:dialogCornerRadius" /> - </shape> - </item> -</selector> diff --git a/res/drawable/presentation_mode_content_protection.xml b/res/drawable/presentation_mode_content_protection.xml deleted file mode 100644 index 446ac9c..0000000 --- a/res/drawable/presentation_mode_content_protection.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?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. ---> -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - <gradient - android:angle="90" - android:startColor="@android:color/black" - android:endColor="@android:color/transparent" - android:type="linear" /> -</shape>
\ No newline at end of file diff --git a/res/layout/bottom_actions_layout.xml b/res/layout/bottom_actions_layout.xml index 76889bc..21039b8 100644 --- a/res/layout/bottom_actions_layout.xml +++ b/res/layout/bottom_actions_layout.xml @@ -34,7 +34,7 @@ android:background="@drawable/bottom_sheet_background" android:theme="@style/WallpaperPicker.BottomPaneStyle" android:clickable="true" - app:behavior_peekHeight="@dimen/preview_attribution_pane_collapsed_height" + app:behavior_peekHeight="0dp" app:layout_behavior="com.android.wallpaper.widget.BottomActionBar$QueueStateBottomSheetBehavior" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/res/layout/grid_item_select_wallpaper_header.xml b/res/layout/grid_item_select_wallpaper_header.xml deleted file mode 100755 index 7884f29..0000000 --- a/res/layout/grid_item_select_wallpaper_header.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - Copyright (C) 2017 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. ---> -<TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/select_wallpaper_header" - android:layout_width="match_parent" - android:layout_height="@dimen/select_wallpaper_header_height" - android:layout_marginLeft="@dimen/select_wallpaper_header_margin_left" - android:layout_marginStart="@dimen/select_wallpaper_header_margin_left" - android:contentDescription="@string/select_wallpaper_label" - android:gravity="start|center_vertical" - android:text="@string/select_wallpaper_label" - android:textAlignment="viewStart" - android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title" - android:textColor="?android:textColorSecondary" - android:textSize="@dimen/abc_text_size_subhead_material"/> diff --git a/res/layout/pill_tabs.xml b/res/layout/pill_tabs.xml index 5a57981..fd14b75 100644 --- a/res/layout/pill_tabs.xml +++ b/res/layout/pill_tabs.xml @@ -28,6 +28,6 @@ app:tabIndicatorColor="?androidprv:attr/colorAccentPrimary" app:tabIndicatorFullWidth="true" app:tabIndicatorGravity="stretch" - app:tabTextColor="?android:textColorTertiary" + app:tabTextColor="@color/tab_text_color" app:tabSelectedTextColor="@color/text_color_primary_on_accent" app:tabTextAppearance="@style/PillTabsTextAppearance" /> diff --git a/res/layout/preview_action.xml b/res/layout/preview_action.xml deleted file mode 100644 index 9f5cc6d..0000000 --- a/res/layout/preview_action.xml +++ /dev/null @@ -1,25 +0,0 @@ -<!-- 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. ---> - -<CheckBox - xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/ActionBarCheckboxStyle" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:background="?android:attr/selectableItemBackgroundBorderless" - android:text="@string/preview" - android:textAllCaps="false" - android:textAppearance="?android:attr/actionMenuTextAppearance" - android:theme="@style/PreviewCheckboxDeviceTheme"/>
\ No newline at end of file diff --git a/res/layout/preview_page_info.xml b/res/layout/preview_page_info.xml deleted file mode 100644 index ce039cf..0000000 --- a/res/layout/preview_page_info.xml +++ /dev/null @@ -1,106 +0,0 @@ -<?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. ---> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/page_info" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:orientation="vertical" - android:paddingHorizontal="@dimen/preview_attribution_pane_horizontal_padding" - android:theme="@style/WallpaperPicker.BottomPaneStyle"> - - <Space - android:id="@+id/preview_attribution_pane_title_spacer" - android:layout_width="0dp" - android:layout_height="@dimen/preview_attribution_pane_inner_spacer_height"/> - - <TextView - android:id="@+id/preview_attribution_pane_title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="@dimen/preview_attribution_pane_title_height" - android:ellipsize="end" - android:forceHasOverlappingRendering="false" - android:gravity="center" - android:singleLine="true" - android:textAppearance="@style/TitleTextAppearance" - android:textColor="@color/material_white_100"/> - - <TextView - android:id="@+id/preview_attribution_pane_subtitle1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="@dimen/preview_attribution_pane_author_height" - android:layout_marginTop="@dimen/preview_attribution_pane_author_top_margin" - android:forceHasOverlappingRendering="false" - android:gravity="center" - android:textAppearance="@style/SubtitleTextAppearance" - android:textColor="@color/material_white_100" - android:visibility="gone"/> - - <TextView - android:id="@+id/preview_attribution_pane_subtitle2" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="@dimen/preview_attribution_pane_description_height" - android:forceHasOverlappingRendering="false" - android:gravity="center_horizontal" - android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small" - android:textSize="12sp" - android:textColor="@color/material_white_100" - android:visibility="gone"/> - - <Space - android:id="@+id/preview_attribution_pane_spacer" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_marginTop="@dimen/preview_attribution_pane_inner_spacer_height" - android:layout_weight="1"/> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/preview_attribution_pane_button_bottom_margin" - android:gravity="center" - android:orientation="horizontal"> - - <Button - style="@style/OutlinedButtonStyle" - android:id="@+id/preview_attribution_pane_explore_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/explore" - android:visibility="gone"/> - - <Space - android:id="@+id/spacer" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_weight="1" - android:visibility="gone"/> - - <Button - style="@style/ButtonStyle" - android:id="@+id/preview_attribution_pane_set_wallpaper_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/set_wallpaper_button_text" - android:visibility="gone"/> - - </LinearLayout> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/preview_page_settings.xml b/res/layout/preview_page_settings.xml deleted file mode 100644 index 4faebb6..0000000 --- a/res/layout/preview_page_settings.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?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. ---> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:gravity="center_horizontal" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:orientation="vertical" - android:paddingHorizontal="@dimen/preview_attribution_pane_horizontal_padding" - android:theme="@style/WallpaperPicker.BottomPaneStyle"> - - <androidx.slice.widget.SliceView - android:id="@+id/settings_slice" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - - <Space - android:id="@+id/preview_attribution_pane_spacer" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_weight="1"/> - - <Button - style="@style/ButtonStyle" - android:id="@+id/preview_settings_pane_set_wallpaper_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/set_wallpaper_button_text"/> - -</LinearLayout> diff --git a/res/layout/set_wallpaper_action.xml b/res/layout/set_wallpaper_action.xml deleted file mode 100755 index 7e727aa..0000000 --- a/res/layout/set_wallpaper_action.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - Copyright (C) 2017 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. ---> -<Button xmlns:android="http://schemas.android.com/apk/res/android" - style="?android:attr/actionButtonStyle" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:textAppearance="?android:attr/actionMenuTextAppearance" /> diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 8914a12..438d4b2 100755 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -14,8 +14,6 @@ limitations under the License. --> <resources> - <dimen name="metadata_tile_thumb_height">164dp</dimen> - <dimen name="metadata_tile_attribution_section_height">80dp</dimen> <!-- Dimensions for "permissions needed" tile. --> <dimen name="permissions_needed_metadata_warning_icon_margin_top">0dp</dimen> @@ -27,5 +25,4 @@ <dimen name="preview_page_gap">60dp</dimen> <dimen name="preview_page_horizontal_margin">92dp</dimen> <dimen name="preview_card_padding">8dp</dimen> - <dimen name="preview_pager_height">150dp</dimen> </resources> diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml deleted file mode 100644 index 1cd5e74..0000000 --- a/res/values-night/colors.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - - Copyright (C) 2020 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> - <color name="preview_pager_background">@color/google_grey900</color> - <color name="fullscreen_preview_background">@color/material_black_100</color> - <color name="edit_background_base">@color/material_white_100</color> - <color name="full_preview_tab_unselected_text_color">@color/white_54_alpha</color> - <color name="bottom_bar_background_color">@color/google_grey900</color> - <color name="bottom_bar_icon_unchecked_color">@color/white_54_alpha</color> - <color name="action_bar_bottom_sheet_text_color">@color/material_white_100</color> -</resources> diff --git a/res/values-notnight-v26/colors.xml b/res/values-notnight-v26/colors.xml index 5283cc6..0a0ff59 100755 --- a/res/values-notnight-v26/colors.xml +++ b/res/values-notnight-v26/colors.xml @@ -14,7 +14,6 @@ limitations under the License. --> <resources> - <color name="primary_color">#ffffff</color> <color name="secondary_color">#f8f9fa</color> <color name="accent_color">@color/material_googblue500</color> diff --git a/res/values-notnight-v26/picker_colors.xml b/res/values-notnight-v26/picker_colors.xml deleted file mode 100755 index 12ed98a..0000000 --- a/res/values-notnight-v26/picker_colors.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - Copyright (C) 2017 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> - <color name="textColorPrimary">@color/black_87_alpha</color> - <color name="textColorSecondary">@color/black_54_alpha</color> - - <color name="category_picker_background_color">@color/material_white_100</color> - <color name="category_title_scrim_color">#E6FFFFFF</color> - <color name="category_title_scrim_color_no_thumbnail">@color/material_grey_100</color> - <color name="category_title_text_color">@color/textColorPrimary</color> - - <color name="currently_set_presentation_mode_text_color">@color/category_title_text_color</color> - <color name="currently_set_title_text_color">@color/textColorPrimary</color> - <color name="currently_set_subtitle_text_color">@color/textColorSecondary</color> - <color name="currently_set_divider_background_color">@android:color/transparent</color> - - <color name="currently_set_both_header_scrim">@color/white_80_alpha</color> - <color name="currently_set_both_refresh_button_color">@color/black_54_alpha</color> - <color name="currently_set_both_title_text_color">@color/textColorPrimary</color> - <color name="currently_set_both_presentation_mode_text_color">@color/textColorSecondary</color> - <color name="currently_set_both_attribution_title_text_color">@color/textColorPrimary</color> - <color name="currently_set_both_attribution_subtitle_text_color">@color/textColorSecondary - </color> - - <color name="select_wallpaper_header_text_color">@color/textColorSecondary</color> - - <color name="individual_tile_title_scrim_color">@color/white_80_alpha</color> - <color name="individual_tile_title_text_color">@color/textColorPrimary</color> - - <color name="individual_picker_background_color">@color/material_white_100</color> - - <color name="toolbar_color">@color/material_white_100</color> -</resources> diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml deleted file mode 100755 index ece1ff7..0000000 --- a/res/values-sw720dp/dimens.xml +++ /dev/null @@ -1,47 +0,0 @@ -<!-- - Copyright (C) 2017 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> - <!-- Dimensions for "single metadata card" configuration. --> - <dimen name="single_metadata_card_layout_height">256dp</dimen> - <dimen name="single_metadata_pane_wallpaper_collection_title_text_size"> - @dimen/abc_text_size_headline_material - </dimen> - <dimen name="single_metadata_pane_wallpaper_subtitle_text_size"> - @dimen/abc_text_size_body_1_material - </dimen> - - <!-- Dimensions for "both metadata tiles" configuration. --> - <dimen name="both_metadata_title_text_size">@dimen/abc_text_size_subhead_material</dimen> - - <!-- Dimensions for "rotation" tile. --> - <dimen name="grid_item_rotation_title_size">16sp</dimen> - - <!-- Dimensions for "Select wallpaper" header. --> - <dimen name="select_wallpaper_header_height">44dp</dimen> - - <!-- 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 preview attribution pane. --> - - <dimen name="preview_attribution_pane_collapsed_height">0dp</dimen> - - <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_title_top_margin">16dp</dimen> - <dimen name="preview_attribution_pane_arrow_top_bottom_margin">8dp</dimen> -</resources> diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml deleted file mode 100755 index 65939e8..0000000 --- a/res/values-sw720dp/styles.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - Copyright (C) 2017 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 xmlns:tools="http://schemas.android.com/tools" tools:targetApi="23"> - <!-- Preview attribution pane styles --> - <style name="preview_attribution_pane_title"> - <item name="android:textColor">@color/material_white_text</item> - <item name="android:textSize">@dimen/abc_text_size_headline_material</item> - </style> - - <style name="preview_attribution_pane_subtitle"> - <item name="android:textColor">@color/material_white_text</item> - <item name="android:textSize">@dimen/abc_text_size_body_1_material</item> - </style> -</resources> diff --git a/res/values-v26/dimens.xml b/res/values-v26/dimens.xml deleted file mode 100755 index 5e0b6aa..0000000 --- a/res/values-v26/dimens.xml +++ /dev/null @@ -1,20 +0,0 @@ -<!-- - Copyright (C) 2017 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> - <!-- Dimensions for "single metadata card" configuration. --> - <dimen name="single_metadata_card_elevation">4dp</dimen> - <dimen name="single_metadata_pane_bottom_offset">12dp</dimen> -</resources> diff --git a/res/values-v29/styles.xml b/res/values-v29/styles.xml deleted file mode 100644 index 6cae735..0000000 --- a/res/values-v29/styles.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. ---> -<resources> - <style name="PreviewCheckboxDeviceTheme" parent="@android:style/ThemeOverlay.DeviceDefault.Accent.DayNight"> - <item name="android:colorControlActivated">?android:attr/colorAccent</item> - <item name="android:colorControlNormal">?android:attr/colorPrimary</item> - </style> -</resources>
\ No newline at end of file diff --git a/res/values/borders.xml b/res/values/borders.xml index 439e218..017fc7c 100644 --- a/res/values/borders.xml +++ b/res/values/borders.xml @@ -3,7 +3,5 @@ <!-- Border shapes --> <!-- All shapes must be drawn in a 100 by 100 square --> <string name="circular_border" translatable="false">M50,0 A50,50,0,1,1,50,100 A50,50,0,1,1,50,0</string> - <string name="diamond_border" translatable="false">M50,0 L100,50 L50,100 L0,50</string> - <string name="squircle_border" translatable="false">"M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z"</string> </resources> diff --git a/res/values/colors.xml b/res/values/colors.xml index 66fdf56..0c144f1 100755 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -16,37 +16,21 @@ <resources> <color name="material_white_text">#ffffff</color> - <color name="material_grey600">#757575</color> <color name="material_grey500">#9e9e9e</color> - <color name="material_grey200">#eeeeee</color> <color name="material_white_100">#ffffff</color> <color name="material_googblue500">#4285f4</color> <color name="material_black_100">#000000</color> - <color name="material_white_divider">#1fffffff</color> <color name="text_color_dark">#2d2d2d</color> <color name="text_color_light">@color/material_white_text</color> - <color name="primary_color">#2d2d2d</color> <color name="secondary_color">#3a3a3a</color> <color name="accent_color">@color/material_googblue500</color> <color name="status_bar_color">@color/material_black_100</color> - <color name="toolbar_color">#000000</color> - - <color name="preview_pager_arrow_disabled">@android:color/darker_gray</color> - <color name="preview_pager_background">@color/secondary_color</color> - <color name="fullscreen_preview_background">@color/secondary_color</color> - <color name="google_grey900">#202124</color> <color name="google_grey700">#5f6368</color> - <color name="edit_background_base">@color/google_grey700</color> - <color name="option_border_default">@color/edit_background_base</color> - <color name="full_preview_tab_unselected_text_color">@color/black_55_alpha</color> - <color name="bottom_bar_background_color">@color/material_white_100</color> - <color name="bottom_bar_icon_unchecked_color">@color/material_grey600</color> - <color name="action_bar_bottom_sheet_text_color">@color/black_87_alpha</color> <color name="smartspace_preview_shadow_color_dark">#B0000000</color> <color name="smartspace_preview_shadow_color_transparent">@android:color/transparent</color> diff --git a/res/values/config.xml b/res/values/config.xml deleted file mode 100755 index 9aad85b..0000000 --- a/res/values/config.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - Copyright (C) 2017 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> - <bool name="enable_no_backup_image_wallpaper">true</bool> -</resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 3533e5b..6b93a56 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -15,18 +15,13 @@ --> <resources> <!-- Default screen margins, per the Android Design guidelines. --> - <dimen name="activity_horizontal_margin">16dp</dimen> - <dimen name="activity_vertical_margin">16dp</dimen> <dimen name="grid_padding">4dp</dimen> <dimen name="grid_padding_desktop">8dp</dimen> <!-- Dimensions for "category" tiles. --> - <dimen name="grid_item_category_label_padding">12dp</dimen> <dimen name="grid_item_category_label_padding_top">12dp</dimen> <dimen name="grid_item_category_label_padding_bottom">4dp</dimen> <dimen name="grid_item_category_label_minimum_height">16dp</dimen> - <dimen name="grid_item_category_overlay_icon_margin_bottom">24dp</dimen> - <dimen name="grid_item_category_title_height">48dp</dimen> <dimen name="grid_tile_aspect_height">340dp</dimen> <dimen name="grid_tile_aspect_width">182dp</dimen> <dimen name="grid_edge_space">20dp</dimen> @@ -34,50 +29,12 @@ <dimen name="category_grid_padding_bottom">16dp</dimen> <!-- Dimensions for individual wallpaper tiles. --> - <dimen name="grid_item_individual_wallpaper_selected_inset">14dp</dimen> - <dimen name="grid_item_individual_wallpaper_check_circle_offset">4dp</dimen> - <dimen name="grid_item_individual_wallpaper_check_circle_size">24dp</dimen> <dimen name="grid_item_individual_padding_top">8dp</dimen> <dimen name="grid_item_individual_label_padding_top">4dp</dimen> <dimen name="grid_item_individual_label_padding_bottom">4dp</dimen> <dimen name="wallpaper_grid_padding_top">16dp</dimen> <dimen name="wallpaper_grid_padding_bottom">24dp</dimen> - <!-- Dimensions for "single metadata card" configuration. --> - <dimen name="single_metadata_card_elevation">2dp</dimen> - <dimen name="single_metadata_card_corner_radius">0dp</dimen> - <dimen name="single_metadata_card_layout_height">192dp</dimen> - <dimen name="single_metadata_pane_vertical_offset">8dp</dimen> - <dimen name="single_metadata_pane_horizontal_offset">8dp</dimen> - <dimen name="single_metadata_pane_bottom_offset">12dp</dimen> - <dimen name="single_metadata_pane_thumb_width">120dp</dimen> - <dimen name="single_metadata_pane_attributions_margin_left">16dp</dimen> - <dimen name="single_metadata_pane_attributions_margin_right">16dp</dimen> - <dimen name="single_metadata_pane_wallpaper_label_margin_top">10dp</dimen> - <dimen name="single_metadata_pane_wallpaper_title_margin_top">12dp</dimen> - - <dimen name="single_metadata_pane_wallpaper_subtitle_text_size"> - @dimen/abc_text_size_caption_material - </dimen> - <dimen name="single_metadata_pane_wallpaper_subtitle_margin_top">3dp</dimen> - <dimen name="single_metadata_pane_wallpaper_subtitle_margin_bottom">10dp</dimen> - <dimen name="single_metadata_explore_button_margin">12dp</dimen> - <dimen name="single_metadata_explore_section_height">48dp</dimen> - <dimen name="single_metadata_skip_button_margin">10dp</dimen> - <dimen name="single_metadata_explore_section_button_padding">5dp</dimen> - - <!-- Dimensions for "both metadata tiles" configuration. --> - <dimen name="both_metadata_thumb_height">208dp</dimen> - <dimen name="both_metadata_content_side_margin">12dp</dimen> - <dimen name="both_metadata_scrim_height">68dp</dimen> - <dimen name="both_metadata_scrim_content_top_margin">9dp</dimen> - <dimen name="both_metadata_scrim_content_bottom_margin">16dp</dimen> - <dimen name="both_metadata_attribution_section_height">132dp</dimen> - <dimen name="both_metadata_attribution_section_top_margin">12dp</dimen> - <dimen name="both_metadata_attribution_section_bottom_margin">16dp</dimen> - <dimen name="both_metadata_title_text_size">@dimen/abc_text_size_body_2_material</dimen> - <dimen name="both_metadata_explore_button_size">50dp</dimen> - <!-- Dimensions for "permissions needed" tile. --> <dimen name="permissions_needed_metadata_content_margin_top">16dp</dimen> <dimen name="permissions_needed_metadata_warning_icon_margin_sides">16dp</dimen> @@ -89,10 +46,6 @@ <!-- Dimensions for "loading indicator" configuration. --> <dimen name="categories_loading_indicator_margin_top">16dp</dimen> - <!-- Dimensions for "Select wallpaper" header. --> - <dimen name="select_wallpaper_header_height">48dp</dimen> - <dimen name="select_wallpaper_header_margin_left">12dp</dimen> - <!-- Dimensions for wallpaper tiles in individual picker when in desktop mode. --> <dimen name="tile_desktop_progress_bar_size">40dp</dimen> @@ -100,35 +53,8 @@ <dimen name="rotation_tile_desktop_label_padding">16dp</dimen> <dimen name="rotation_tile_desktop_label_text_size">13sp</dimen> - <!-- Dimensions for the preview fragment. --> - <dimen name="preview_toolbar_up_button_start_padding">0dp</dimen> - <dimen name="preview_toolbar_set_wallpaper_button_end_padding">12dp</dimen> - - <dimen name="preview_attribution_pane_collapsed_height">0dp</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_content_bottom_margin">12dp</dimen> - <dimen name="preview_attribution_pane_title_top_margin">16dp</dimen> - <dimen name="preview_attribution_pane_title_end_margin">48dp</dimen> - <dimen name="preview_attribution_pane_arrow_start_margin">16dp</dimen> - <dimen name="preview_attribution_pane_arrow_top_bottom_margin">4dp</dimen> - <dimen name="preview_attribution_pane_arrow_size">48dp</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_height">48dp</dimen> - <dimen name="preview_attribution_pane_explore_left_margin">2dp</dimen> - <dimen name="preview_attribution_pane_explore_bottom_margin">16dp</dimen> + <!-- Dimensions for the attribution pane. --> <dimen name="preview_attribution_pane_horizontal_padding">24dp</dimen> - <dimen name="preview_attribution_pane_extra_spacer_height">16dp</dimen> - <dimen name="preview_attribution_pane_inner_spacer_height">14dp</dimen> - <dimen name="preview_attribution_pane_title_height">48dp</dimen> - <dimen name="preview_attribution_pane_author_height">24dp</dimen> - <dimen name="preview_attribution_pane_author_top_margin">0dp</dimen> - <dimen name="preview_attribution_pane_description_height">34dp</dimen> - <dimen name="preview_attribution_pane_button_bottom_margin">8dp</dimen> - - <dimen name="preview_gradient_background_height">256dp</dimen> <!-- Dimensions for the "start rotation" dialog. --> <dimen name="start_rotation_dialog_subhead_margin_top">19dp</dimen> @@ -183,11 +109,6 @@ <dimen name="disabled_by_admin_desktop_message_text_size">13sp</dimen> <dimen name="preview_bottom_sheet_corner_radius">?android:attr/dialogCornerRadius</dimen> - <!-- Dimensions for the minimum height of the scalable content container. --> - <dimen name="content_container_minimum_height">300dp</dimen> - <!-- Dimensions for the maximum height of the scalable content container. --> - <dimen name="content_container_maximum_height">400dp</dimen> - <!-- Dimensions for PreviewPager and PageIndicator. --> <dimen name="preview_indicator_width">16dp</dimen> <dimen name="preview_indicator_height">8dp</dimen> @@ -202,8 +123,6 @@ <dimen name="preview_card_padding">20dp</dimen> <dimen name="preview_pager_max_height">450dp</dimen> <dimen name="preview_pager_min_height">350dp</dimen> - <dimen name="preview_pager_height">450dp</dimen> - <dimen name="system_rounded_corner">@*android:dimen/rounded_corner_radius_top</dimen> <!-- The maximum height ratio of PreviewPager and its parent view. --> <item name="preview_pager_maximum_height_ratio" format="float" type="dimen">0.7</item> @@ -213,13 +132,11 @@ <!-- Dimensions for the bottom bar. --> <dimen name="bottom_navbar_height">96dp</dimen> - <dimen name="bottom_action_bar_preview_info_padding_vertical">20dp</dimen> <dimen name="bottom_action_button_width">72dp</dimen> <dimen name="bottom_action_button_height">48dp</dimen> <dimen name="bottom_action_button_margin_top">24dp</dimen> <dimen name="bottom_action_button_padding_horizontal">26dp</dimen> <dimen name="bottom_action_button_radius">100dp</dimen> - <dimen name="bottom_action_icon_size">20dp</dimen> <dimen name="bottom_sheet_margin">24dp</dimen> <dimen name="wallpaper_info_pane_padding">24dp</dimen> diff --git a/res/values/picker_colors.xml b/res/values/picker_colors.xml index aa2dfe8..51438e6 100755 --- a/res/values/picker_colors.xml +++ b/res/values/picker_colors.xml @@ -14,52 +14,14 @@ limitations under the License. --> <resources> - <color name="black_24_alpha">#3D000000</color> - <color name="black_38_alpha">#61000000</color> - <color name="black_54_alpha">#8A000000</color> - <color name="black_55_alpha">#8C000000</color> - <color name="black_67_alpha">#AB000000</color> - <color name="black_87_alpha">#DE000000</color> - <color name="translucent_black_lighter">#59000000</color> <!-- Color for material black text @ 60% opacity. --> <color name="translucent_black_60_alpha">#99000000</color> <color name="translucent_black_90_alpha">#E6000000</color> <color name="translucent_black">@color/translucent_black_60_alpha</color> - + <color name="black_67_alpha">#AB000000</color> <color name="light_grey">#d8d8d8</color> <color name="white_34_alpha">#57FFFFFF</color> - <color name="white_54_alpha">#8AFFFFFF</color> - <color name="white_60_alpha">#99FFFFFF</color> <color name="white_67_alpha">#ABFFFFFF</color> <color name="white_70_alpha">#B3FFFFFF</color> - <color name="white_80_alpha">#CCFFFFFF</color> - <color name="white_88_alpha">#E0FFFFFF</color> - - <!-- Dark scrollbar thumb color (26% of black) --> - <color name="scrollbar_thumb_color_dark">#43000000</color> - - <color name="category_picker_background_color">@color/material_grey200</color> - <color name="category_title_scrim_color">@color/translucent_black</color> - <color name="category_title_scrim_color_no_thumbnail">@color/translucent_black</color> - <color name="category_title_text_color">@color/material_white_100</color> - - <color name="currently_set_presentation_mode_text_color">@color/category_title_text_color</color> - <color name="currently_set_title_text_color">@color/material_white_text</color> - <color name="currently_set_subtitle_text_color">@color/white_70_alpha</color> - <color name="currently_set_divider_background_color">@color/material_white_divider</color> - <color name="currently_set_explore_button_color">@color/white_80_alpha</color> - - <color name="currently_set_both_header_scrim">@color/translucent_black</color> - <color name="currently_set_both_refresh_button_color">@color/material_white_100</color> - <color name="currently_set_both_title_text_color">@color/material_white_text</color> - <color name="currently_set_both_presentation_mode_text_color">@color/material_white_text</color> - <color name="currently_set_both_attribution_title_text_color">@color/material_white_text</color> - <color name="currently_set_both_attribution_subtitle_text_color">@color/white_70_alpha</color> - - <color name="select_wallpaper_header_text_color">@color/white_60_alpha</color> - - <color name="individual_tile_title_scrim_color">@color/translucent_black</color> - <color name="individual_tile_title_text_color">@color/material_white_100</color> - <color name="preview_pane_arrow_color">@color/material_white_100</color> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 111fc79..f317f7f 100755 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -81,27 +81,6 @@ </item> </style> - <style name="WallpaperTheme.DarkActionBar" parent="@style/WallpaperTheme.Preview"> - <item name="colorControlNormal">?attr/colorPrimary</item> - <item name="colorButtonNormal">?attr/colorPrimary</item> - <item name="android:colorControlActivated">?attr/colorPrimary</item> - <item name="android:colorControlHighlight">?attr/colorPrimary</item> - <item name="actionMenuTextColor">?attr/colorPrimary</item> - <item name="android:actionMenuTextColor">?attr/colorPrimary</item> - <item name="android:actionMenuTextAppearance">@style/WallpaperPicker.Preview.TextAppearance.ActionBar</item> - </style> - - <!-- Toolbar --> - <style name="TranslucentToolbarStyle" parent="@style/Widget.AppCompat.Toolbar"> - <item name="android:background">@android:color/transparent</item> - <item name="android:theme">@style/WallpaperTheme.DarkActionBar</item> - </style> - - <style name="RegularToolbarStyle" parent="@style/Widget.AppCompat.Toolbar"> - <item name="android:elevation">0dp</item> - <item name="android:theme">@style/WallpaperTheme</item> - </style> - <!-- Dialog themes --> <style name="LightDialogTheme" parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar"> <item name="android:layout">@layout/abc_alert_dialog_material</item> @@ -125,11 +104,6 @@ </style> <!-- Individual components / Widgets --> - <style name="ButtonStyle" parent="@android:style/Widget.DeviceDefault.Button.Colored"> - <item name="android:padding">16dp</item> - <item name="android:minHeight">48dp</item> - </style> - <style name="OutlinedButtonStyle" parent="@android:style/Widget.DeviceDefault.Button"> <item name="android:background">@drawable/btn_transparent</item> <item name="android:textColor">?android:attr/colorAccent</item> @@ -143,20 +117,6 @@ <item name="android:textSize">16sp</item> </style> - <style name="ActionBarCheckboxStyle" parent="@android:style/Widget.DeviceDefault.CompoundButton.CheckBox"> - <item name="android:textColor">?android:attr/colorPrimary</item> - </style> - - <style name="PreviewCheckboxDeviceTheme" parent="@android:style/Theme.DeviceDefault"> - <item name="android:colorControlNormal">?android:attr/colorPrimary</item> - </style> - - <style name="select_wallpaper_header"> - <item name="android:textColor">@color/translucent_black_60_alpha</item> - <item name="android:textStyle">bold</item> - <item name="android:textSize">@dimen/abc_text_size_body_2_material</item> - </style> - <!-- Preview attribution pane styles --> <style name="WallpaperPicker.BottomPaneStyle" parent="@android:style/Theme.DeviceDefault.Settings"> <item name="tabTextAppearance">@style/WallpaperPicker.Preview.TextAppearance.NoAllCaps</item> @@ -173,27 +133,11 @@ <item name="tabMaxWidth">0dp</item> </style> - <style name="preview_attribution_pane_title"> - <item name="android:textColor">@color/material_white_text</item> - <item name="android:textSize">@dimen/abc_text_size_subhead_material</item> - </style> - - <style name="preview_attribution_pane_subtitle"> - <item name="android:textColor">@color/material_white_text</item> - <item name="android:textSize">@dimen/abc_text_size_body_2_material</item> - </style> - <style name="WallpaperPicker.Preview.TextAppearance.NoAllCaps" parent="@android:style/TextAppearance.DeviceDefault.Widget.TabWidget"> <item name="android:textAllCaps">false</item> </style> - <style name="WallpaperPicker.Preview.TextAppearance.ActionBar" - parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Menu"> - <item name="android:textAllCaps">false</item> - <item name="android:textColor">@color/material_white_100</item> - </style> - <!-- Set wallpaper destination item --> <style name="set_wallpaper_destination_item"> <item name="android:minHeight">@dimen/set_wallpaper_dialog_item_min_height</item> diff --git a/res/xml/no_backup_image_wallpaper.xml b/res/xml/no_backup_image_wallpaper.xml deleted file mode 100755 index d438b69..0000000 --- a/res/xml/no_backup_image_wallpaper.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - Copyright (C) 2017 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. ---> -<wallpaper xmlns:android="http://schemas.android.com/apk/res/android" - android:description="@string/no_backup_image_wallpaper_description" - android:label="@string/no_backup_image_wallpaper_label" - android:thumbnail="@drawable/material_ic_wallpaper_white_48" /> diff --git a/tests/src/com/android/wallpaper/picker/PreviewActivityTest.java b/tests/src/com/android/wallpaper/picker/PreviewActivityTest.java index 98855fa..eee481a 100644 --- a/tests/src/com/android/wallpaper/picker/PreviewActivityTest.java +++ b/tests/src/com/android/wallpaper/picker/PreviewActivityTest.java @@ -147,7 +147,7 @@ public class PreviewActivityTest { launchActivityIntentWithMockWallpaper(); assertNull(mWallpaperPersister.getCurrentHomeWallpaper()); - onView(withId(R.id.preview_attribution_pane_set_wallpaper_button)).perform(click()); + onView(withId(R.id.action_apply)).perform(click()); // Destination dialog is shown; click "Home screen". onView(withText(R.string.set_wallpaper_home_screen_destination)).perform(click()); @@ -175,7 +175,7 @@ public class PreviewActivityTest { launchActivityIntentWithMockWallpaper(); assertNull(mWallpaperPersister.getCurrentLockWallpaper()); - onView(withId(R.id.preview_attribution_pane_set_wallpaper_button)).perform(click()); + onView(withId(R.id.action_apply)).perform(click()); // Destination dialog is shown; click "Lock screen." onView(withText(R.string.set_wallpaper_lock_screen_destination)).perform(click()); @@ -204,7 +204,7 @@ public class PreviewActivityTest { assertNull(mWallpaperPersister.getCurrentHomeWallpaper()); assertNull(mWallpaperPersister.getCurrentLockWallpaper()); - onView(withId(R.id.preview_attribution_pane_set_wallpaper_button)).perform(click()); + onView(withId(R.id.action_apply)).perform(click()); // Destination dialog is shown; click "Both." onView(withText(R.string.set_wallpaper_both_destination)).perform(click()); @@ -237,7 +237,7 @@ public class PreviewActivityTest { mWallpaperPersister.setFailNextCall(true); - onView(withId(R.id.preview_attribution_pane_set_wallpaper_button)).perform(click()); + onView(withId(R.id.action_apply)).perform(click()); // Destination dialog is shown; click "Home screen." onView(withText(R.string.set_wallpaper_home_screen_destination)).perform(click()); @@ -276,7 +276,7 @@ public class PreviewActivityTest { mWallpaperPersister.setFailNextCall(true); - onView(withId(R.id.preview_attribution_pane_set_wallpaper_button)).perform(click()); + onView(withId(R.id.action_apply)).perform(click()); // Destination dialog is shown; click "Lock screen." onView(withText(R.string.set_wallpaper_lock_screen_destination)).perform(click()); @@ -316,7 +316,7 @@ public class PreviewActivityTest { mWallpaperPersister.setFailNextCall(true); - onView(withId(R.id.preview_attribution_pane_set_wallpaper_button)).perform(click()); + onView(withId(R.id.action_apply)).perform(click()); // Destination dialog is shown; click "Both." onView(withText(R.string.set_wallpaper_both_destination)).perform(click()); @@ -355,7 +355,7 @@ public class PreviewActivityTest { // Scale should not have a meaningful value before clicking "set wallpaper". assertTrue(mWallpaperPersister.getScale() < 0); - onView(withId(R.id.preview_attribution_pane_set_wallpaper_button)).perform(click()); + onView(withId(R.id.action_apply)).perform(click()); // Destination dialog is shown; click "Home screen". onView(withText(R.string.set_wallpaper_home_screen_destination)).perform(click()); @@ -380,7 +380,7 @@ public class PreviewActivityTest { throws Throwable { launchActivityIntentWithMockWallpaper(); mWallpaperPersister.setFailNextCall(true); - onView(withId(R.id.preview_attribution_pane_set_wallpaper_button)).perform(click()); + onView(withId(R.id.action_apply)).perform(click()); // Destination dialog is shown; click "Home screen". onView(withText(R.string.set_wallpaper_home_screen_destination)).perform(click()); @@ -396,7 +396,7 @@ public class PreviewActivityTest { @Test public void testClickSetWallpaper_ShowsDestinationDialog() { launchActivityIntentWithMockWallpaper(); - onView(withId(R.id.preview_attribution_pane_set_wallpaper_button)).perform(click()); + onView(withId(R.id.action_apply)).perform(click()); onView(withText(R.string.set_wallpaper_dialog_message)).check(matches(isDisplayed())); } @@ -451,7 +451,7 @@ public class PreviewActivityTest { assertNotEquals(ActivityInfo.SCREEN_ORIENTATION_LOCKED, activity.getRequestedOrientation()); // Show SetWallpaperDialog. - onView(withId(R.id.preview_attribution_pane_set_wallpaper_button)).perform(click()); + onView(withId(R.id.action_apply)).perform(click()); assertEquals(ActivityInfo.SCREEN_ORIENTATION_LOCKED, activity.getRequestedOrientation()); @@ -468,7 +468,7 @@ public class PreviewActivityTest { assertNotEquals(ActivityInfo.SCREEN_ORIENTATION_LOCKED, activity.getRequestedOrientation()); // Show SetWallpaperDialog. - onView(withId(R.id.preview_attribution_pane_set_wallpaper_button)).perform(click()); + onView(withId(R.id.action_apply)).perform(click()); // Destination dialog is shown; click "Home screen". onView(withText(R.string.set_wallpaper_home_screen_destination)).perform(click()); @@ -486,13 +486,13 @@ public class PreviewActivityTest { launchActivityIntentWithMockWallpaper(); PreviewActivity activity = mActivityRule.getActivity(); - TextView titleView = activity.findViewById(R.id.preview_attribution_pane_title); + TextView titleView = activity.findViewById(R.id.wallpaper_info_title); assertEquals("Title", titleView.getText()); - TextView subtitle1View = activity.findViewById(R.id.preview_attribution_pane_subtitle1); + TextView subtitle1View = activity.findViewById(R.id.wallpaper_info_subtitle1); assertEquals("Subtitle 1", subtitle1View.getText()); - TextView subtitle2View = activity.findViewById(R.id.preview_attribution_pane_subtitle2); + TextView subtitle2View = activity.findViewById(R.id.wallpaper_info_subtitle2); assertEquals("Subtitle 2", subtitle2View.getText()); } @@ -522,7 +522,7 @@ public class PreviewActivityTest { mExploreIntentChecker.setViewHandlerExists(false); launchActivityIntentWithMockWallpaper(); - onView(withId(R.id.preview_attribution_pane_explore_button)).check( + onView(withId(R.id.wallpaper_info_explore_button)).check( matches(not(isDisplayed()))); } } |
