Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update rotary highlight on bordered buttons" into rvc-qpr-dev am: 773641f557

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181025

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6570fc9f05fecc3ca529a06d5e28dadf63e0bdd9
This commit is contained in:
TreeHugger Robot
2020-12-10 20:52:39 +00:00
committed by Automerger Merge Worker
parent c17829d67c 773641f557
commit ae05f9703a
1 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
core/res/res/drawable-car/car_button_background.xml
View File

@@ -13,24 +13,48 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<!-- Default background styles for car buttons when enabled/disabled. --> <!-- Default background styles for car buttons when enabled/disabled,
<ripple focused/unfocused, and pressed/unpressed -->
xmlns:android="http://schemas.android.com/apk/res/android" <!-- TODO(b/175161842) Add rotary fill color -->
android:color="?android:attr/colorControlHighlight"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:state_enabled="false">
<shape android:shape="rectangle">
<corners android:radius="@*android:dimen/car_button_radius"/>
<solid android:color="@*android:color/car_grey_300"/>
<stroke android:width="8dp"
android:color="#0059B3"/>
</shape>
</item>
<item android:state_focused="true" android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="@*android:dimen/car_button_radius"/>
<solid android:color="?android:attr/colorButtonNormal"/>
<stroke android:width="4dp"
android:color="#0059B3"/>
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="rectangle">
<corners android:radius="@*android:dimen/car_button_radius"/>
<solid android:color="?android:attr/colorButtonNormal"/>
<stroke android:width="8dp"
android:color="#0059B3"/>
</shape>
</item>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<corners android:radius="@*android:dimen/car_button_radius"/>
<solid android:color="@*android:color/car_grey_300"/>
</shape>
</item>
<item> <item>
<selector> <ripple android:color="?android:attr/colorControlHighlight">
<item android:state_enabled="false">
<shape android:shape="rectangle">
<corners android:radius="@*android:dimen/car_button_radius"/>
<solid android:color="@*android:color/car_grey_300"/>
</shape>
</item>
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="@*android:dimen/car_button_radius"/> <corners android:radius="@*android:dimen/car_button_radius"/>
<solid android:color="?android:attr/colorButtonNormal"/> <solid android:color="?android:attr/colorButtonNormal"/>
</shape> </shape>
</item> </item>
</selector> </ripple>
</item> </item>
</ripple> </selector>