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

Update rotary highlight on bordered buttons

Browse Source 
This adds a rotary highlight around bordered
buttons. Previously the rotary highlight
was only visible as the ripple expanded to fill
the button, which was extremely subtle and
hard to see.

Due to issues with layering and corner radiuses,
this cl doesn't include the rotary fill color.
It only has the stroke around the outside
of the button. File b/175161842 to address
that.

Bug: 174490425
Test: Manually
Change-Id: I2abb54b9be04d33c642ce0509a88696afc028c9b
This commit is contained in:
Cole Faust
2020-12-07 15:31:26 -08:00
parent 14f8a22b7b
commit 8f65d7d249
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
limitations under the License.
-->
<!-- Default background styles for car buttons when enabled/disabled. -->
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:attr/colorControlHighlight">
<!-- Default background styles for car buttons when enabled/disabled,
focused/unfocused, and pressed/unpressed -->
<!-- TODO(b/175161842) Add rotary fill color -->
<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>
<selector>
<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>
<ripple android:color="?android:attr/colorControlHighlight">
<item>
<shape android:shape="rectangle">
<corners android:radius="@*android:dimen/car_button_radius"/>
<solid android:color="?android:attr/colorButtonNormal"/>
</shape>
</item>
</selector>
</ripple>
</item>
</ripple>
</selector>