From 784f02720e4589b50a91ad092e4c89a2abda0e6a Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Wed, 3 Dec 2014 15:47:49 -0800 Subject: [PATCH] [FRP] Transitions for lock screen setup Use the slide transition for activities using the setup theme. Bug: 18482708 Change-Id: I1a60a24f426118a63ec219bfbb378f255f362fa7 --- res/anim-ldrtl/slide_back_in.xml | 22 ++++++++++++++++++++++ res/anim-ldrtl/slide_back_out.xml | 22 ++++++++++++++++++++++ res/anim-ldrtl/slide_next_in.xml | 22 ++++++++++++++++++++++ res/anim-ldrtl/slide_next_out.xml | 22 ++++++++++++++++++++++ res/anim/slide_back_in.xml | 22 ++++++++++++++++++++++ res/anim/slide_back_out.xml | 22 ++++++++++++++++++++++ res/anim/slide_next_in.xml | 22 ++++++++++++++++++++++ res/anim/slide_next_out.xml | 22 ++++++++++++++++++++++ res/values/config.xml | 3 +++ res/values/themes.xml | 9 +++++++++ 10 files changed, 188 insertions(+) create mode 100644 res/anim-ldrtl/slide_back_in.xml create mode 100644 res/anim-ldrtl/slide_back_out.xml create mode 100644 res/anim-ldrtl/slide_next_in.xml create mode 100644 res/anim-ldrtl/slide_next_out.xml create mode 100644 res/anim/slide_back_in.xml create mode 100644 res/anim/slide_back_out.xml create mode 100644 res/anim/slide_next_in.xml create mode 100644 res/anim/slide_next_out.xml diff --git a/res/anim-ldrtl/slide_back_in.xml b/res/anim-ldrtl/slide_back_in.xml new file mode 100644 index 00000000000..e5ab3e57017 --- /dev/null +++ b/res/anim-ldrtl/slide_back_in.xml @@ -0,0 +1,22 @@ + + + + diff --git a/res/anim-ldrtl/slide_back_out.xml b/res/anim-ldrtl/slide_back_out.xml new file mode 100644 index 00000000000..8717f6ac187 --- /dev/null +++ b/res/anim-ldrtl/slide_back_out.xml @@ -0,0 +1,22 @@ + + + + diff --git a/res/anim-ldrtl/slide_next_in.xml b/res/anim-ldrtl/slide_next_in.xml new file mode 100644 index 00000000000..009ea9fb590 --- /dev/null +++ b/res/anim-ldrtl/slide_next_in.xml @@ -0,0 +1,22 @@ + + + + diff --git a/res/anim-ldrtl/slide_next_out.xml b/res/anim-ldrtl/slide_next_out.xml new file mode 100644 index 00000000000..b7ab2b614c5 --- /dev/null +++ b/res/anim-ldrtl/slide_next_out.xml @@ -0,0 +1,22 @@ + + + + diff --git a/res/anim/slide_back_in.xml b/res/anim/slide_back_in.xml new file mode 100644 index 00000000000..009ea9fb590 --- /dev/null +++ b/res/anim/slide_back_in.xml @@ -0,0 +1,22 @@ + + + + diff --git a/res/anim/slide_back_out.xml b/res/anim/slide_back_out.xml new file mode 100644 index 00000000000..b7ab2b614c5 --- /dev/null +++ b/res/anim/slide_back_out.xml @@ -0,0 +1,22 @@ + + + + diff --git a/res/anim/slide_next_in.xml b/res/anim/slide_next_in.xml new file mode 100644 index 00000000000..e5ab3e57017 --- /dev/null +++ b/res/anim/slide_next_in.xml @@ -0,0 +1,22 @@ + + + + diff --git a/res/anim/slide_next_out.xml b/res/anim/slide_next_out.xml new file mode 100644 index 00000000000..8717f6ac187 --- /dev/null +++ b/res/anim/slide_next_out.xml @@ -0,0 +1,22 @@ + + + + diff --git a/res/values/config.xml b/res/values/config.xml index a6fd34e7c1e..f830e0667b9 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -34,4 +34,7 @@ false + + + 300 diff --git a/res/values/themes.xml b/res/values/themes.xml index d4875e2cc10..b426c00ded7 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -34,6 +34,7 @@ @color/setup_wizard_color_accent_dark @dimen/setup_wizard_margin_sides @dimen/setup_wizard_margin_sides + @style/Animation.SetupWizard ?android:attr/colorBackground adjustPan @*android:style/PreferencePanel.Dialog @@ -52,6 +53,7 @@ @color/setup_wizard_color_accent_light @dimen/setup_wizard_margin_sides @dimen/setup_wizard_margin_sides + @style/Animation.SetupWizard ?android:attr/colorBackground adjustPan @*android:style/PreferencePanel.Dialog @@ -65,6 +67,13 @@ ?android:attr/colorBackground + +