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

Commit 2e5b8fc1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove fragment_pick_button_background_color and fallback to default" into main

parents 0d3d8e2c 44ddfb27
Loading
Loading
Loading
Loading
+0 −20
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
+0 −20
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
+0 −2
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@
            app:cornerRadius="@dimen/button_corner_radius"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:backgroundTint="@color/fragment_pick_button_background_color"
            android:textColor="@color/fragment_pick_button_text_color"
            android:layout_marginStart="@dimen/picker_saver_button_gap"
            android:layout_marginEnd="@dimen/picker_saver_button_gap" />