diff options
| author | 2019-04-11 02:57:23 +0000 | |
|---|---|---|
| committer | 2019-04-11 02:57:23 +0000 | |
| commit | 065eda458c8d57a81d1f558a2b35f0e9e15b6e52 (patch) | |
| tree | aefc939958a039185105841bd4aedc6392e92afb | |
| parent | 61987bcaf58e5fca1b908b827784b8235c94ffaa (diff) | |
| parent | c2325f3b1eadab9ce16fc9666c371c2c60e8b2ce (diff) | |
Merge "Simplifying duplicate resource definition" into qt-dev
| -rw-r--r-- | packages/SystemUI/res/values/attrs_car.xml | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/packages/SystemUI/res/values/attrs_car.xml b/packages/SystemUI/res/values/attrs_car.xml index 41e078699647..ced26c95dfd9 100644 --- a/packages/SystemUI/res/values/attrs_car.xml +++ b/packages/SystemUI/res/values/attrs_car.xml @@ -15,16 +15,23 @@ --> <resources> + <attr name="icon" format="reference"/> + <attr name="selectedIcon" format="reference"/> + <attr name="intent" format="string"/> + <attr name="longIntent" format="string"/> + <attr name="selectedAlpha" format="float" /> + <attr name="unselectedAlpha" format="float" /> + <!-- Allow for custom attribs to be added to a facet button --> <declare-styleable name="CarFacetButton"> <!-- icon to be rendered (drawable) --> - <attr name="icon" format="reference"/> + <attr name="icon"/> <!-- icon to be rendered when in selected state --> - <attr name="selectedIcon" format="reference"/> + <attr name="selectedIcon"/> <!-- intent to start when button is click --> - <attr name="intent" format="string"/> + <attr name="intent"/> <!-- intent to start when a long press has happened --> - <attr name="longIntent" format="string"/> + <attr name="longIntent"/> <!-- categories that will be added as extras to the fired intents --> <attr name="categories" format="string"/> <!-- package names that will be added as extras to the fired intents --> @@ -32,9 +39,9 @@ <!-- componentName names that will be used for detecting selected state --> <attr name="componentNames" format="string" /> <!-- Alpha value to used when in selected state. Defaults 1f --> - <attr name="selectedAlpha" format="float" /> + <attr name="selectedAlpha" /> <!-- Alpha value to used when in un-selected state. Defaults 0.7f --> - <attr name="unselectedAlpha" format="float" /> + <attr name="unselectedAlpha" /> <!-- Render a "more" icon. Defaults true --> <attr name="useMoreIcon" format="boolean" /> @@ -44,17 +51,17 @@ <!-- Allow for custom attribs to be added to a nav button --> <declare-styleable name="CarNavigationButton"> <!-- intent to start when button is click --> - <attr name="intent" format="string"/> + <attr name="intent" /> <!-- intent to start when a long press has happened --> - <attr name="longIntent" format="string"/> + <attr name="longIntent" /> <!-- start the intent as a broad cast instead of an activity if true--> <attr name="broadcast" format="boolean"/> <!-- Alpha value to used when in selected state. Defaults 1f --> - <attr name="selectedAlpha" format="float" /> + <attr name="selectedAlpha" /> <!-- Alpha value to used when in un-selected state. Defaults 0.7f --> - <attr name="unselectedAlpha" format="float" /> + <attr name="unselectedAlpha" /> <!-- icon to be rendered when in selected state --> - <attr name="selectedIcon" format="reference"/> + <attr name="selectedIcon" /> </declare-styleable> <!-- Custom attributes to configure hvac values --> @@ -89,6 +96,6 @@ </attr> <!-- Icon resource ids to render on UI --> - <attr name="icon" format="reference"/> + <attr name="icon" /> </declare-styleable> </resources> |