summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorcretin45 <cretin45@gmail.com>2015-02-16 11:46:30 -0800
committercretin45 <cretin45@gmail.com>2015-02-16 16:52:06 -0800
commit9d72db9dbeae863c39253688b79525ac75f1306b (patch)
tree084bb6cd15347e90176ed0aff3479a74556a16cf /res/layout
parentaaec6f7e3e46081f256465fe549a56cde6332b78 (diff)
downloadpackages_apps_SetupWizard-9d72db9dbeae863c39253688b79525ac75f1306b.zip
packages_apps_SetupWizard-9d72db9dbeae863c39253688b79525ac75f1306b.tar.gz
packages_apps_SetupWizard-9d72db9dbeae863c39253688b79525ac75f1306b.tar.bz2
SetupWizard: Reveal the default wallpaper on oobe finish
Change-Id: I68a256853f256af3464da7eba57a307a810d80cd
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/button_bar.xml3
-rw-r--r--res/layout/header.xml1
-rw-r--r--res/layout/header_condensed.xml3
-rw-r--r--res/layout/logo_header.xml1
-rw-r--r--res/layout/setup_main.xml20
5 files changed, 18 insertions, 10 deletions
diff --git a/res/layout/button_bar.xml b/res/layout/button_bar.xml
index 213183b..1bb2992 100644
--- a/res/layout/button_bar.xml
+++ b/res/layout/button_bar.xml
@@ -17,7 +17,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/button_bar"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:background="@color/button_bar_background">
<Button
style="@style/ButtonBar.Left"
diff --git a/res/layout/header.xml b/res/layout/header.xml
index 396bf3b..e335b79 100644
--- a/res/layout/header.xml
+++ b/res/layout/header.xml
@@ -18,6 +18,7 @@
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="@dimen/header_height"
+ android:background="@color/header_bg"
style="@style/Header">
<TextView
diff --git a/res/layout/header_condensed.xml b/res/layout/header_condensed.xml
index 955d50c..9319836 100644
--- a/res/layout/header_condensed.xml
+++ b/res/layout/header_condensed.xml
@@ -17,7 +17,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/header"
android:layout_width="match_parent"
- android:layout_height="@dimen/page_title_height"
+ android:layout_height="@dimen/header_condensed_height"
+ android:background="@color/header_condensed_bg"
style="@style/Header">
<TextView
diff --git a/res/layout/logo_header.xml b/res/layout/logo_header.xml
index c8fbaaa..8e55740 100644
--- a/res/layout/logo_header.xml
+++ b/res/layout/logo_header.xml
@@ -18,6 +18,7 @@
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="@dimen/logo_header_height"
+ android:background="@color/primary"
style="@style/Header">
<ImageView
diff --git a/res/layout/setup_main.xml b/res/layout/setup_main.xml
index 4e1e484..48aef4b 100644
--- a/res/layout/setup_main.xml
+++ b/res/layout/setup_main.xml
@@ -14,12 +14,16 @@
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:id="@+id/root"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clickable="true">
+<com.cyanogenmod.setupwizard.ui.widget.ScrimInsetsFrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/root"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clickable="true"
+ android:fitsSystemWindows="true"
+ app:insetForeground="@android:color/transparent">
<LinearLayout android:orientation="vertical"
android:layout_width="match_parent"
@@ -31,7 +35,7 @@
android:layout_weight="1"
style="@style/PageContainer"/>
- <include layout="@layout/button_bar" />
+ <include layout="@layout/button_bar"/>
</LinearLayout>
@@ -41,5 +45,5 @@
android:background="@drawable/reveal"
android:visibility="invisible"/>
-</FrameLayout>
+</com.cyanogenmod.setupwizard.ui.widget.ScrimInsetsFrameLayout>