diff options
| author | Gus Prevas <kprevas@google.com> | 2015-09-17 17:34:46 -0400 |
|---|---|---|
| committer | Gus Prevas <kprevas@google.com> | 2015-09-25 13:10:52 -0400 |
| commit | 1ed322b123b5aa8cd02c036e5e3393b6a79f559f (patch) | |
| tree | d08adcece2b43a58edddbe09d872ff2304f420aa /core/res/res/values | |
| parent | de02fe2afdc835eca72bb05a1514daa439bb2b40 (diff) | |
| download | frameworks_base-1ed322b123b5aa8cd02c036e5e3393b6a79f559f.zip frameworks_base-1ed322b123b5aa8cd02c036e5e3393b6a79f559f.tar.gz frameworks_base-1ed322b123b5aa8cd02c036e5e3393b6a79f559f.tar.bz2 | |
Adds an option to override RemoteViews transition.
This change adds a configuration option,
"config_overrideRemoteViewsActivityTransition", which is false by
default and true on watches. If it's true, when a RemoteViews
is clicked, it will use a new attribute on the active window animation
style, "activityOpenRemoteViewsEnterAnimation", to determine
the entry transition to use, instead of the current hard-coded
default.
Bug: 23534750
Change-Id: I91e92804a663ab71a3e46c3430fa579b87cc7931
Diffstat (limited to 'core/res/res/values')
| -rw-r--r-- | core/res/res/values/attrs.xml | 7 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/styles_micro.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
4 files changed, 13 insertions, 0 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index cf83422..2828d21 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2144,6 +2144,13 @@ i (which is exiting the screen). The wallpaper remains static behind the animation. --> <attr name="wallpaperIntraCloseExitAnimation" format="reference" /> + + <!-- When opening a new activity from a RemoteViews, this is the + animation that is run on the next activity (which is entering the + screen). Requires config_overrideRemoteViewsActivityTransition to + be true. --> + <attr name="activityOpenRemoteViewsEnterAnimation" format="reference" /> + </declare-styleable> <!-- ============================= --> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index f1e26aa..0859e5a 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2217,6 +2217,10 @@ <bool name="config_defaultWindowFeatureOptionsPanel">true</bool> <bool name="config_defaultWindowFeatureContextMenu">true</bool> + <!-- If true, the transition for a RemoteViews is read from a resource instead of using the + default scale-up transition. --> + <bool name="config_overrideRemoteViewsActivityTransition">false</bool> + <!-- This config is used to check if the carrier requires converting destination number before sending out a SMS. Formats for this configuration as below: diff --git a/core/res/res/values/styles_micro.xml b/core/res/res/values/styles_micro.xml index c6052ff..05835e7 100644 --- a/core/res/res/values/styles_micro.xml +++ b/core/res/res/values/styles_micro.xml @@ -18,6 +18,7 @@ <style name="Animation.Micro.Activity" parent="Animation.Material.Activity"> <item name="activityOpenEnterAnimation">@anim/slide_in_micro</item> + <item name="activityOpenRemoteViewsEnterAnimation">@anim/slide_in_micro</item> <item name="activityOpenExitAnimation">@null</item> <item name="activityCloseEnterAnimation">@null</item> <item name="activityCloseExitAnimation">@anim/slide_out_micro</item> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index bdbc86f..6d8c38f 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2203,6 +2203,7 @@ <java-symbol type="bool" name="config_sms_force_7bit_encoding" /> <java-symbol type="bool" name="config_defaultWindowFeatureOptionsPanel" /> <java-symbol type="bool" name="config_defaultWindowFeatureContextMenu" /> + <java-symbol type="bool" name="config_overrideRemoteViewsActivityTransition" /> <java-symbol type="layout" name="simple_account_item" /> <java-symbol type="array" name="config_sms_convert_destination_number_support" /> |