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

Commit 9142a526 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] fix: fragment pick material next changes 2p: 8b9ba38f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15845513

Change-Id: I6f0be0aa99c57551a962adf3e7a63b9196d4e444
parents 50e344f7 8b9ba38f

res/color/fragment_pick_button_background_color.xml

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

  Copyright 2018 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



      https://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:color="@color/fragment_pick_active_button_color" android:state_enabled="true" />

  <item android:color="@color/fragment_pick_inactive_button_color" android:state_enabled="false" />

</selector>
 
 No newline at end of file

res/color/fragment_pick_button_text_color.xml

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

  Copyright 2018 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



      https://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:color="@color/fragment_pick_active_text_color" android:state_enabled="true" />

  <item android:color="@color/fragment_pick_inactive_text_color" android:state_enabled="false" />

</selector>
 
 No newline at end of file

res/layout/fragment_pick.xml

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="4dp"

            android:backgroundTint="@color/fragment_pick_button_background_color"

            android:textColor="@color/fragment_pick_button_text_color"

            android:layout_marginEnd="4dp" />



        <!-- Handles touch events when button1 is disabled. -->

res/values-night-v31/colors.xml

+17 −2
Original line number Diff line number Diff line
@@ -18,9 +18,11 @@ 
  <color name="work_profile_button_stroke_color">

    @*android:color/system_accent1_200

  </color> <!-- accent 200 -->

  <color name="empty_state_text_color">@*android:color/system_neutral1_100</color>

  <color name="empty_state_text_color">@*android:color/system_neutral1_100

  </color>

  <!-- neutral 100 -->

  <color name="empty_state_message_text_color">@*android:color/system_neutral2_200

  <color name="empty_state_message_text_color">

    @*android:color/system_neutral2_200

  </color>

  <!-- neutral variant 200 -->

  <color name="tab_unselected_text_color">@*android:color/system_neutral2_200
@@ -32,4 +34,17 @@ 
  <color name="profile_tab_selected_color">@*android:color/system_neutral2_100

  </color>

  <!-- neutral variant 100 -->

  <color name="fragment_pick_inactive_button_color">

    @*android:color/system_neutral1_800

  </color>

  <!-- neutral 100 -->

  <color name="fragment_pick_inactive_text_color">

    @*android:color/system_neutral1_600

  </color>

  <!-- neutral 600 -->

  <color name="fragment_pick_active_button_color">

    @*android:color/system_neutral2_100

  </color>

  <!-- neutral variant 100 -->

  <color name="fragment_pick_active_text_color">@android:color/black</color>

</resources>

res/values-night/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -33,4 +33,6 @@ 


    <color name="list_divider_color">#9aa0a6</color>

    <color name="list_item_selected_background_color">?android:colorSecondary</color>



    <color name="fragment_pick_active_text_color">#202124</color> <!-- Grey 900 -->

</resources>