am 73a68c07: am 45f44ad7: am a3dff74e: Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev
* commit '73a68c0727fbc2caa85109eea17e2b583c5905c1': [FRP] Transitions for lock screen setup
This commit is contained in:
@@ -34,4 +34,7 @@
|
||||
|
||||
<!-- Carrier_enabled editable -->
|
||||
<bool name="config_allow_edit_carrier_enabled" translatable="false">false</bool>
|
||||
|
||||
<!-- The duration (in milliseconds) of activity transitions -->
|
||||
<integer name="setup_wizard_transition_duration">300</integer>
|
||||
</resources>
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
<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>
|
||||
@@ -52,6 +53,7 @@
|
||||
<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>
|
||||
@@ -65,6 +67,13 @@
|
||||
<item name="preferenceBackgroundColor">?android:attr/colorBackground</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>
|
||||
|
||||
Reference in New Issue
Block a user