diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-31 16:51:34 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-08-31 17:28:09 -0700 |
commit | 702996867bf80dd6652a46303cc06568e6f78369 (patch) | |
tree | c124e34ce19a20146288d6fd93104d448f7dd5c8 /res | |
parent | 03412672d141629593561031e331739c28bc7476 (diff) | |
download | android_packages_wallpapers_LivePicker-702996867bf80dd6652a46303cc06568e6f78369.tar.gz android_packages_wallpapers_LivePicker-702996867bf80dd6652a46303cc06568e6f78369.tar.bz2 android_packages_wallpapers_LivePicker-702996867bf80dd6652a46303cc06568e6f78369.zip |
Updating the LiveWallpaperPicker UI
> Using the settings theme
> Removing GirdLayout usage, using ListView with appropriate padding
> Removing trampoline activity when starting wallpaper preview
Change-Id: Iea12a8c1c6d6cdc0682add07e1b9565827da71c8
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-xlarge/live_wallpaper_base.xml | 19 | ||||
-rw-r--r-- | res/layout-xlarge/live_wallpaper_entry.xml | 45 | ||||
-rw-r--r-- | res/layout-xlarge/live_wallpaper_list.xml | 51 | ||||
-rw-r--r-- | res/layout/live_wallpaper_base.xml | 20 | ||||
-rw-r--r-- | res/layout/live_wallpaper_entry.xml | 10 | ||||
-rw-r--r-- | res/layout/live_wallpaper_list.xml | 38 | ||||
-rw-r--r-- | res/values-xlarge/dimensions.xml | 4 | ||||
-rw-r--r-- | res/values-xlarge/styles.xml | 22 | ||||
-rw-r--r-- | res/values/dimensions.xml | 5 | ||||
-rw-r--r-- | res/values/strings.xml | 2 | ||||
-rw-r--r-- | res/values/styles.xml | 14 |
11 files changed, 21 insertions, 209 deletions
diff --git a/res/layout-xlarge/live_wallpaper_base.xml b/res/layout-xlarge/live_wallpaper_base.xml deleted file mode 100644 index 3c1888c..0000000 --- a/res/layout-xlarge/live_wallpaper_base.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" />
\ No newline at end of file diff --git a/res/layout-xlarge/live_wallpaper_entry.xml b/res/layout-xlarge/live_wallpaper_entry.xml deleted file mode 100644 index cecdf59..0000000 --- a/res/layout-xlarge/live_wallpaper_entry.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="8dp"> - <ImageView - android:id="@+id/thumbnail" - android:layout_width="@dimen/live_wallpaper_grid_item_width" - android:layout_height="@dimen/live_wallpaper_grid_item_height" - android:layout_gravity="center" - android:layout_weight="1" - android:scaleType="centerCrop" /> - <TextView - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_gravity="center" - android:gravity="bottom" - android:singleLine="true" - android:ellipsize="marquee" - - android:textColor="#FFFFFFFF" - android:textSize="14sp" - android:shadowColor="#FF000000" - android:shadowDx="0.0" - android:shadowDy="1.0" - android:shadowRadius="1.0" /> -</LinearLayout> diff --git a/res/layout-xlarge/live_wallpaper_list.xml b/res/layout-xlarge/live_wallpaper_list.xml deleted file mode 100644 index 49a1786..0000000 --- a/res/layout-xlarge/live_wallpaper_list.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="24dp" - android:paddingRight="24dp" - android:paddingTop="24dp" - android:paddingBottom="24dp" - android:gravity="center"> - <GridView - android:id="@android:id/list" - android:layout_width="702dp" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:numColumns="3" - android:stretchMode="none" - android:columnWidth="@dimen/live_wallpaper_grid_item_width" - android:verticalSpacing="0dp" - android:horizontalSpacing="0dp" - android:drawSelectorOnTop="false" /> - <TextView - android:id="@android:id/empty" - android:layout_width="match_parent" - android:layout_height="match_parent" - - android:gravity="center" - android:visibility="gone" - - android:text="@string/live_wallpaper_empty" - android:textColor="#FFFFFFFF" - android:textSize="14sp" - android:shadowColor="#FF000000" - android:shadowDx="0.0" - android:shadowDy="1.0" - android:shadowRadius="1.0" /> -</FrameLayout>
\ No newline at end of file diff --git a/res/layout/live_wallpaper_base.xml b/res/layout/live_wallpaper_base.xml index bb4c960..dfbd212 100644 --- a/res/layout/live_wallpaper_base.xml +++ b/res/layout/live_wallpaper_base.xml @@ -16,9 +16,21 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> - <fragment class="com.android.wallpaper.livepicker.LiveWallpaperActivity$WallpaperDialog" - android:id="@+id/live_wallpaper_fragment" + android:layout_height="match_parent" + android:paddingLeft="@dimen/screen_margin_sides" + android:paddingRight="@dimen/screen_margin_sides"> + <ListView + android:id="@android:id/list" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:drawSelectorOnTop="false" /> + + <TextView + android:id="@android:id/empty" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" + android:visibility="gone" + android:text="@string/live_wallpaper_empty" + android:textAppearance="?android:attr/textAppearanceMedium" /> </FrameLayout> diff --git a/res/layout/live_wallpaper_entry.xml b/res/layout/live_wallpaper_entry.xml index df75e84..a133841 100644 --- a/res/layout/live_wallpaper_entry.xml +++ b/res/layout/live_wallpaper_entry.xml @@ -17,43 +17,33 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="6dip" android:paddingEnd="6dip" android:paddingTop="6dip" android:paddingBottom="6dip" - android:minHeight="?android:attr/listPreferredItemHeight"> <ImageView android:id="@+id/thumbnail" - android:layout_width="@dimen/live_wallpaper_thumbnail_width" android:layout_height="@dimen/live_wallpaper_thumbnail_height" - android:layout_gravity="center_vertical" - android:scaleType="centerCrop" /> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="10dip" android:layout_marginEnd="8dip" android:layout_centerVertical="true" android:layout_toEndOf="@id/thumbnail" - android:orientation="vertical"> <TextView android:id="@+id/title" - android:layout_width="match_parent" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:singleLine="true" android:ellipsize="marquee" /> diff --git a/res/layout/live_wallpaper_list.xml b/res/layout/live_wallpaper_list.xml deleted file mode 100644 index a3c22bb..0000000 --- a/res/layout/live_wallpaper_list.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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. ---> - -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <ListView - android:id="@android:id/list" - - android:layout_width="match_parent" - android:layout_height="match_parent" - - android:drawSelectorOnTop="false" /> - - <TextView - android:id="@android:id/empty" - android:layout_width="match_parent" - android:layout_height="match_parent" - - android:gravity="center" - android:visibility="gone" - - android:text="@string/live_wallpaper_empty" - android:textAppearance="?android:attr/textAppearanceMedium" /> -</FrameLayout>
\ No newline at end of file diff --git a/res/values-xlarge/dimensions.xml b/res/values-xlarge/dimensions.xml index b60f099..14edc8e 100644 --- a/res/values-xlarge/dimensions.xml +++ b/res/values-xlarge/dimensions.xml @@ -18,7 +18,5 @@ --> <resources> - <dimen name="live_wallpaper_grid_item_width">224dip</dimen> - <dimen name="live_wallpaper_grid_item_height">192dip</dimen> - <dimen name="live_wallpaper_preview_button_width">200dip</dimen> + <dimen name="screen_margin_sides">128dip</dimen> </resources> diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml deleted file mode 100644 index c7e0e33..0000000 --- a/res/values-xlarge/styles.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -* Copyright (C) 2010 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="LivePickerTheme" parent="@*android:Theme.Holo.Dialog.NoFrame" /> -</resources> diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index 89074de..d08e573 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -22,6 +22,7 @@ <dimen name="live_wallpaper_thumbnail_text_offset">12dip</dimen> <dimen name="live_wallpaper_thumbnail_width">75dip</dimen> <dimen name="live_wallpaper_thumbnail_height">75dip</dimen> - <dimen name="dialog_content_inset">0dip</dimen> - <dimen name="live_wallpaper_preview_button_width">160dip</dimen> + + <dimen name="screen_margin_sides">0dip</dimen> + </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 7af69c7..9c508de 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -41,7 +41,5 @@ <string name="wallpaper_title_and_author"><xliff:g id="title" example="Galaxy">%1$s</xliff:g> by <xliff:g id="author" example="Google">%2$s</xliff:g></string> <!-- Message, tells the user the selected live wallpaper is loading. --> <string name="live_wallpaper_loading">Loading live wallpaper…</string> - <!-- Button label, action, cancels the wallpaper picker dialog [CHAR_LIMIT=40]--> - <string name="wallpaper_cancel">Cancel</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index b908235..01747e7 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -19,19 +19,7 @@ <resources> - <style name="WallpaperTitle"> - <item name="android:textSize">20dip</item> - <item name="android:shadowColor">#FF000000</item> - <item name="android:shadowRadius">2.5</item> - <item name="android:shadowDx">0</item> - <item name="android:shadowDy">0</item> - <item name="android:textColor">#FFFFFFFF</item> - <item name="android:gravity">left</item> - </style> - - <style name="LivePickerTheme" parent="android:style/Theme.Holo"> - <item name="android:windowNoTitle">true</item> - </style> + <style name="LivePickerTheme" parent="@android:style/Theme.DeviceDefault.Settings" /> <style name="Preview" parent="@android:style/Theme.DeviceDefault"> <item name="android:actionBarStyle">@style/PreviewActionBar</item> |