From 9d72db9dbeae863c39253688b79525ac75f1306b Mon Sep 17 00:00:00 2001 From: cretin45 Date: Mon, 16 Feb 2015 11:46:30 -0800 Subject: [PATCH] SetupWizard: Reveal the default wallpaper on oobe finish Change-Id: I68a256853f256af3464da7eba57a307a810d80cd --- AndroidManifest.xml | 1 + res/anim/fadein.xml | 6 - res/anim/fadeout.xml | 6 - res/layout-land/logo_header.xml | 1 + res/layout/button_bar.xml | 3 +- res/layout/header.xml | 1 + res/layout/header_condensed.xml | 3 +- res/layout/logo_header.xml | 1 + res/layout/setup_main.xml | 20 ++- res/values-land/colors.xml | 2 +- res/values-land/dimens.xml | 2 +- res/values/attrs.xml | 20 +++ res/values/colors.xml | 5 +- res/values/dimens.xml | 5 +- res/values/styles.xml | 4 +- .../setupwizard/setup/CMSetupWizardData.java | 1 - .../setup/CyanogenSettingsPage.java | 9 -- .../setupwizard/setup/FinishPage.java | 6 - .../setupwizard/setup/OtherSettingsPage.java | 13 +- .../setupwizard/setup/WelcomePage.java | 6 - .../setupwizard/ui/SetupPageFragment.java | 1 - .../setupwizard/ui/SetupWizardActivity.java | 56 +++++-- .../ui/widget/ScrimInsetsFrameLayout.java | 142 ++++++++++++++++++ 23 files changed, 240 insertions(+), 74 deletions(-) delete mode 100644 res/anim/fadein.xml delete mode 100644 res/anim/fadeout.xml create mode 100644 res/values/attrs.xml create mode 100644 src/com/cyanogenmod/setupwizard/ui/widget/ScrimInsetsFrameLayout.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 72b6722..a982a30 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -77,6 +77,7 @@ android:label="@string/product_name" android:launchMode="singleInstance" android:excludeFromRecents="true" + android:uiOptions="none" android:immersive="true"> diff --git a/res/anim/fadein.xml b/res/anim/fadein.xml deleted file mode 100644 index 6773402..0000000 --- a/res/anim/fadein.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/res/anim/fadeout.xml b/res/anim/fadeout.xml deleted file mode 100644 index 1922a80..0000000 --- a/res/anim/fadeout.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/res/layout-land/logo_header.xml b/res/layout-land/logo_header.xml index 30929e7..8bb5652 100644 --- a/res/layout-land/logo_header.xml +++ b/res/layout-land/logo_header.xml @@ -20,6 +20,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:paddingTop="@dimen/header_logo_margin_top" + android:background="@color/primary" style="@style/Header"> + android:layout_height="wrap_content" + android:background="@color/button_bar_background">