diff options
author | Maurice Lam <yukl@google.com> | 2015-03-03 18:27:48 -0800 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2015-04-17 04:46:09 +0000 |
commit | bddc56648569ed21b696ca5451cd1fc82009bb43 (patch) | |
tree | d8b008b2dde31b0e91422f659aee5e6ea0253033 /res | |
parent | a928ff4a67756341a972569a1029c0e981c9bb8d (diff) | |
download | packages_apps_Settings-bddc56648569ed21b696ca5451cd1fc82009bb43.zip packages_apps_Settings-bddc56648569ed21b696ca5451cd1fc82009bb43.tar.gz packages_apps_Settings-bddc56648569ed21b696ca5451cd1fc82009bb43.tar.bz2 |
Use SetupWizardLib helpers
Use SystemBarHelper, WizardManagerHelper and themes from Setup Wizard
Library.
Bug: 19594252
Change-Id: I60b6ab4f086a170ac270fb08325fc42010293523
Diffstat (limited to 'res')
-rw-r--r-- | res/anim-ldrtl/slide_back_in.xml | 22 | ||||
-rw-r--r-- | res/anim-ldrtl/slide_back_out.xml | 22 | ||||
-rw-r--r-- | res/anim-ldrtl/slide_next_in.xml | 22 | ||||
-rw-r--r-- | res/anim-ldrtl/slide_next_out.xml | 22 | ||||
-rw-r--r-- | res/anim/slide_back_in.xml | 22 | ||||
-rw-r--r-- | res/anim/slide_back_out.xml | 22 | ||||
-rw-r--r-- | res/anim/slide_next_in.xml | 22 | ||||
-rw-r--r-- | res/anim/slide_next_out.xml | 22 | ||||
-rw-r--r-- | res/values/colors.xml | 4 | ||||
-rw-r--r-- | res/values/themes.xml | 17 |
10 files changed, 3 insertions, 194 deletions
diff --git a/res/anim-ldrtl/slide_back_in.xml b/res/anim-ldrtl/slide_back_in.xml deleted file mode 100644 index e5ab3e5..0000000 --- a/res/anim-ldrtl/slide_back_in.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. ---> - -<translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/setup_wizard_transition_duration" - android:fromXDelta="100%" - android:toXDelta="0%" - android:interpolator="@android:anim/decelerate_interpolator"/> diff --git a/res/anim-ldrtl/slide_back_out.xml b/res/anim-ldrtl/slide_back_out.xml deleted file mode 100644 index 8717f6a..0000000 --- a/res/anim-ldrtl/slide_back_out.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. ---> - -<translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/setup_wizard_transition_duration" - android:fromXDelta="0%" - android:toXDelta="-100%" - android:interpolator="@android:anim/decelerate_interpolator"/> diff --git a/res/anim-ldrtl/slide_next_in.xml b/res/anim-ldrtl/slide_next_in.xml deleted file mode 100644 index 009ea9f..0000000 --- a/res/anim-ldrtl/slide_next_in.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. ---> - -<translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/setup_wizard_transition_duration" - android:fromXDelta="-100%" - android:toXDelta="0%" - android:interpolator="@android:anim/decelerate_interpolator"/> diff --git a/res/anim-ldrtl/slide_next_out.xml b/res/anim-ldrtl/slide_next_out.xml deleted file mode 100644 index b7ab2b6..0000000 --- a/res/anim-ldrtl/slide_next_out.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. ---> - -<translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/setup_wizard_transition_duration" - android:fromXDelta="0%" - android:toXDelta="100%" - android:interpolator="@android:anim/decelerate_interpolator"/> diff --git a/res/anim/slide_back_in.xml b/res/anim/slide_back_in.xml deleted file mode 100644 index 009ea9f..0000000 --- a/res/anim/slide_back_in.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. ---> - -<translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/setup_wizard_transition_duration" - android:fromXDelta="-100%" - android:toXDelta="0%" - android:interpolator="@android:anim/decelerate_interpolator"/> diff --git a/res/anim/slide_back_out.xml b/res/anim/slide_back_out.xml deleted file mode 100644 index b7ab2b6..0000000 --- a/res/anim/slide_back_out.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. ---> - -<translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/setup_wizard_transition_duration" - android:fromXDelta="0%" - android:toXDelta="100%" - android:interpolator="@android:anim/decelerate_interpolator"/> diff --git a/res/anim/slide_next_in.xml b/res/anim/slide_next_in.xml deleted file mode 100644 index e5ab3e5..0000000 --- a/res/anim/slide_next_in.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. ---> - -<translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/setup_wizard_transition_duration" - android:fromXDelta="100%" - android:toXDelta="0%" - android:interpolator="@android:anim/decelerate_interpolator"/> diff --git a/res/anim/slide_next_out.xml b/res/anim/slide_next_out.xml deleted file mode 100644 index 8717f6a..0000000 --- a/res/anim/slide_next_out.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. ---> - -<translate xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="@integer/setup_wizard_transition_duration" - android:fromXDelta="0%" - android:toXDelta="-100%" - android:interpolator="@android:anim/decelerate_interpolator"/> diff --git a/res/values/colors.xml b/res/values/colors.xml index 88cd3cb..dd7382f 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -44,11 +44,9 @@ <color name="setup_lock_pattern_view_regular_color_dark">#ffbdbdbd</color> <color name="setup_lock_pattern_view_regular_color_light">@color/lock_pattern_view_regular_color</color> <color name="setup_lock_pattern_view_success_color_dark">#ff84ffff</color> - <color name="setup_lock_pattern_view_success_color_light">@color/setup_wizard_color_accent_light</color> + <color name="setup_lock_pattern_view_success_color_light">@color/suw_color_accent_light</color> <color name="setup_lock_pattern_view_error_color_dark">#fff44336</color> <color name="setup_lock_pattern_view_error_color_light">@color/lock_pattern_view_error_color</color> - <color name="setup_wizard_color_accent_dark">#ff00e4ff</color> - <color name="setup_wizard_color_accent_light">#ff00828e</color> <color name="setup_wizard_wifi_color_dark">#ff00e4ff</color> <color name="setup_wizard_wifi_color_light">#ff0096a6</color> diff --git a/res/values/themes.xml b/res/values/themes.xml index 379c36a..0d28126 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -29,14 +29,11 @@ <item name="android:windowBackground">@null</item> </style> - <style name="SetupWizardTheme" parent="android:Theme.Material.NoActionBar"> + <style name="SetupWizardTheme" parent="SuwThemeMaterial"> <item name="android:alertDialogTheme">@style/Theme.WifiDialog</item> - <item name="android:colorAccent">@color/setup_wizard_color_accent_dark</item> <item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item> <item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item> - <item name="android:windowAnimationStyle">@style/Animation.SetupWizard</item> <item name="android:windowBackground">?android:attr/colorBackground</item> - <item name="android:windowSoftInputMode">adjustPan</item> <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item> <item name="ic_menu_add">@drawable/ic_menu_add_dark</item> <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item> @@ -53,14 +50,11 @@ <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_dark</item> </style> - <style name="SetupWizardTheme.Light" parent="android:Theme.Material.Light.NoActionBar"> + <style name="SetupWizardTheme.Light" parent="SuwThemeMaterial.Light"> <item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item> - <item name="android:colorAccent">@color/setup_wizard_color_accent_light</item> <item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item> <item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item> - <item name="android:windowAnimationStyle">@style/Animation.SetupWizard</item> <item name="android:windowBackground">?android:attr/colorBackground</item> - <item name="android:windowSoftInputMode">adjustPan</item> <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item> <item name="ic_menu_add">@drawable/ic_menu_add_light</item> <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item> @@ -77,13 +71,6 @@ <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_light</item> </style> - <style name="Animation.SetupWizard" parent="@android:style/Animation.Activity"> - <item name="android:activityOpenEnterAnimation">@anim/slide_next_in</item> - <item name="android:activityOpenExitAnimation">@anim/slide_next_out</item> - <item name="android:activityCloseEnterAnimation">@anim/slide_back_in</item> - <item name="android:activityCloseExitAnimation">@anim/slide_back_out</item> - </style> - <style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert"> <item name="android:windowSoftInputMode">adjustResize</item> <item name="ic_menu_add">@drawable/ic_menu_add_dark</item> |