summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorLalit Kansara <lkansara@codeaurora.org>2016-12-06 16:39:10 +0530
committerNaveen Kumar <kumarn@codeaurora.org>2016-12-08 00:21:57 +0530
commitb5ef268cf8119b893c208655a0139a803b6f1c48 (patch)
tree774c3d1aeaf93f03d9505d74b9d2eead039906ed /res/layout
parentcf093f3546f841d04b55588bed97c2efdafa5bad (diff)
parent98d4aea6e1904ca257440ce8dfa1a8cd6388c6ad (diff)
downloadandroid_packages_wallpapers_LivePicker-b5ef268cf8119b893c208655a0139a803b6f1c48.tar.gz
android_packages_wallpapers_LivePicker-b5ef268cf8119b893c208655a0139a803b6f1c48.tar.bz2
android_packages_wallpapers_LivePicker-b5ef268cf8119b893c208655a0139a803b6f1c48.zip
Merge N-MR1 to remote branch.
Change-Id: I916ac42d638af29d5a285666ca04b3ab22d553b7
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/live_wallpaper_loading.xml24
-rw-r--r--res/layout/live_wallpaper_preview.xml157
-rw-r--r--res/layout/set_wallpaper_action.xml24
-rw-r--r--res/layout/wallpaper_target_dialog_item.xml29
4 files changed, 187 insertions, 47 deletions
diff --git a/res/layout/live_wallpaper_loading.xml b/res/layout/live_wallpaper_loading.xml
deleted file mode 100644
index dff8b86..0000000
--- a/res/layout/live_wallpaper_loading.xml
+++ /dev/null
@@ -1,24 +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.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
-
- android:gravity="center"
-
- android:text="@string/live_wallpaper_loading"
- android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/res/layout/live_wallpaper_preview.xml b/res/layout/live_wallpaper_preview.xml
index 6dcb644..fb8ab5c 100644
--- a/res/layout/live_wallpaper_preview.xml
+++ b/res/layout/live_wallpaper_preview.xml
@@ -1,25 +1,136 @@
-<?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.
--->
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/ActionBarSetWallpaperStyle"
+ ~ 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
+ -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:drawablePadding="8dp"
- android:drawableStart="@drawable/ic_tick"
- android:gravity="start|center_vertical"
- android:onClick="setLiveWallpaper"
- android:text="@string/wallpaper_instructions" />
+ android:layout_height="match_parent">
+
+ <FrameLayout
+ android:id="@+id/loading"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="#ff000000"
+ android:forceHasOverlappingRendering="false">
+
+ <ProgressBar
+ style="@android:style/Widget.Material.ProgressBar"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:indeterminate="true"/>
+
+ </FrameLayout>
+
+ <FrameLayout android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true">
+
+ <android.support.design.widget.CoordinatorLayout
+ android:id="@+id/coordinator_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom">
+
+ <RelativeLayout android:id="@+id/bottom_sheet"
+ 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"/>
+
+ <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"/>
+
+ </RelativeLayout>
+
+ </android.support.design.widget.CoordinatorLayout>
+
+ <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"/>
+
+ </FrameLayout>
+</FrameLayout>
diff --git a/res/layout/set_wallpaper_action.xml b/res/layout/set_wallpaper_action.xml
new file mode 100644
index 0000000..02f4fcd
--- /dev/null
+++ b/res/layout/set_wallpaper_action.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ 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
+ -->
+
+<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:text="@string/set_live_wallpaper"
+ android:textAppearance="?android:attr/actionMenuTextAppearance"
+ android:background="?android:attr/selectableItemBackgroundBorderless"/> \ No newline at end of file
diff --git a/res/layout/wallpaper_target_dialog_item.xml b/res/layout/wallpaper_target_dialog_item.xml
new file mode 100644
index 0000000..70d399f
--- /dev/null
+++ b/res/layout/wallpaper_target_dialog_item.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ 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
+ -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/text1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:textAppearance="?android:attr/textAppearanceListItemSmall"
+ android:textColor="?android:attr/textColorAlertDialogListItem"
+ android:gravity="center_vertical"
+ android:alpha="0.87"
+ android:paddingStart="?android:attr/dialogPreferredPadding"
+ android:drawablePadding="32dp"
+ android:paddingEnd="?android:attr/dialogPreferredPadding"
+ android:ellipsize="marquee" /> \ No newline at end of file