Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 369f147e authored by Ned Burns's avatar Ned Burns
Browse files

Update guts to match latest specs 

- Updates dimens and margins to match specs
- Adds selection color for border, icon, and text
- Adjusts fonts to be theme-aware

Test: manual
Bug: 132689331
Change-Id: Ibd2ca853c9a571f25d82151bdd736edb4d5c5d5e
parent d0ee2548

packages/SystemUI/res/color/notification_guts_priority_button_bg_fill.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2019 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ 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

  -->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_selected="true"

          android:color="@color/notification_guts_priority_button_bg_fill_color_selected" />

    <item android:color="@color/notification_guts_priority_button_bg_fill_color" />

</selector>

packages/SystemUI/res/color/notification_guts_priority_button_bg_stroke.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2019 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ 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

  -->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_selected="true"

          android:color="@color/notification_guts_priority_button_bg_stroke_color_selected" />

    <item android:color="@color/notification_guts_priority_button_bg_stroke_color" />

</selector>

packages/SystemUI/res/color/notification_guts_priority_contents.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2019 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ 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.

  -->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_selected="true"

          android:color="@color/notification_guts_priority_button_content_color_selected" />

    <item android:color="@color/notification_guts_priority_button_content_color" />

</selector>

packages/SystemUI/res/drawable/button_border_selected.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2019 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  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.

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

    <solid

        android:color="@color/notification_guts_selection_bg" />

    <stroke

        android:width="1dp"

        android:color="@color/GM2_grey_300"/>

    <corners android:radius="@dimen/rect_button_radius" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/button_border_unselected.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2019 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  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.

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle"

       android:color="@color/notification_guts_selection_bg">

    <stroke

        android:width="1dp"

        android:color="@color/GM2_grey_300"/>



    <corners android:radius="@dimen/rect_button_radius" />

</shape>
 
 No newline at end of file