diff options
author | Jorim Jaggi <jjaggi@google.com> | 2016-05-24 00:30:00 -0700 |
---|---|---|
committer | Jorim Jaggi <jjaggi@google.com> | 2016-06-02 19:09:51 -0700 |
commit | 7d98c8fca6d1edd51178a65847687d81562d7d6e (patch) | |
tree | cc8136cfcfb660fb73c026faf9bd1b514fa984fc /res/values | |
parent | b30b95f9db068faf294e43fb7927d911ecfaf892 (diff) | |
download | android_packages_wallpapers_LivePicker-7d98c8fca6d1edd51178a65847687d81562d7d6e.tar.gz android_packages_wallpapers_LivePicker-7d98c8fca6d1edd51178a65847687d81562d7d6e.tar.bz2 android_packages_wallpapers_LivePicker-7d98c8fca6d1edd51178a65847687d81562d7d6e.zip |
Adjust wallpaper picker to match static wallpaper picker
- Implement new action bar
- Use BottomSheet behavior from design lib
- Fill in values from live wallpaper if desired
- Don't use separate dialog for loading state
Bug: 28770685
Change-Id: I8dd862fe4c83f702e249f7f3644df89fee771f4f
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/colors.xml | 2 | ||||
-rw-r--r-- | res/values/dimensions.xml | 15 | ||||
-rw-r--r-- | res/values/strings.xml | 8 | ||||
-rw-r--r-- | res/values/styles.xml | 32 |
4 files changed, 39 insertions, 18 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index d49e104..a81efb6 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -20,5 +20,7 @@ <resources> <color name="live_wallpaper_thumbnail_background">#CC666666</color> <color name="live_wallpaper_thumbnail_text_color">#FFFFFFFF</color> + + <color name="translucent_black">#96000000</color> </resources> diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index d08e573..73792df 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -25,4 +25,19 @@ <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 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_explore_top_margin">12dp</dimen> + <dimen name="preview_attribution_pane_explore_bottom_margin">16dp</dimen> + <dimen name="preview_attribution_pane_spacer_height">32dp</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 3e9ac84..99e48e6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -46,4 +46,12 @@ <string name="which_wallpaper_option_home_screen">Home screen</string> <!-- 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> + + <!-- 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> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 01747e7..361d824 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -21,28 +21,24 @@ <style name="LivePickerTheme" parent="@android:style/Theme.DeviceDefault.Settings" /> - <style name="Preview" parent="@android:style/Theme.DeviceDefault"> - <item name="android:actionBarStyle">@style/PreviewActionBar</item> - <item name="android:windowAnimationStyle">@android:style/Animation.Activity</item> - <item name="android:windowFullscreen">true</item> - <item name="android:windowActionBarOverlay">true</item> - <item name="android:windowTranslucentNavigation">true</item> + <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> <item name="android:windowBackground">@android:color/transparent</item> - <item name="android:colorBackgroundCacheHint">@null</item> - </style> + <item name="android:windowContentOverlay">@null</item> - <style name="PreviewActionBar" parent="@android:style/Widget.DeviceDefault.ActionBar"> - <item name="android:displayOptions">showCustom</item> - <item name="android:background">#88000000</item> - <item name="android:contentInsetEnd">0dp</item> - <item name="android:contentInsetLeft">0dp</item> - <item name="android:contentInsetRight">0dp</item> - <item name="android:contentInsetStart">0dp</item> + <!-- Set status bar and navigation buttons to be translucent. --> + <item name="android:colorPrimaryDark">@color/translucent_black</item> + <item name="android:navigationBarColor">@color/translucent_black</item> </style> - <style name="ActionBarSetWallpaperStyle" parent="@android:style/Widget.DeviceDefault.ActionButton"> - <item name="android:textColor">#ffffffff</item> - <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item> + <style name="TranslucentToolbarStyle" parent="@style/Widget.AppCompat.Toolbar"> + <item name="android:background">@color/translucent_black</item> + <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> </style> + <style name="AttributionPaneTitle" parent="@android:style/TextAppearance.Material.Subhead"/> + </resources>
\ No newline at end of file |