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

Commit 04c37528 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move SettingsLib icons to android."

parents 8bd54058 93913614
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1825,7 +1825,7 @@
        <activity
            android:name="Settings$PrintSettingsActivity"
            android:label="@string/print_settings"
            android:icon="@drawable/ic_settings_print"
            android:icon="@*android:drawable/ic_settings_print"
            android:parentActivityName="Settings">
            <intent-filter android:priority="1">
                <action android:name="android.settings.ACTION_PRINT_SETTINGS" />
+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@

    <item android:state_checked="true" android:drawable="@drawable/ic_expand_less" />

    <item android:drawable="@drawable/ic_expand_more" />
    <item android:drawable="@*android:drawable/ic_expand_more" />

</selector>

res/drawable/ic_expand_more.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2015 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.
-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
    android:tint="?android:attr/colorControlNormal">

    <path
        android:fillColor="#000000"
        android:pathData="M8.12 9.29L12 13.17l3.88-3.88a.996 .996 0 1 1 1.41 1.41l-4.59 4.59a.996 .996 0 0
1-1.41 0L6.7 10.7a.996 .996 0 0 1 0-1.41c.39-.38 1.03-.39 1.42 0z" />

</vector>
+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@
    android:id="@+id/switch_ime_button"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:src="@drawable/ic_lockscreen_ime"
    android:src="@*android:drawable/ic_lockscreen_ime"
    android:clickable="true"
    android:contentDescription="@string/crypt_keeper_switch_input_method"
    android:padding="@dimen/crypt_keeper_edit_text_ime_padding"
+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@
            android:paddingTop="@dimen/homepage_condition_header_indicator_padding_top"
            android:paddingStart="@dimen/homepage_condition_header_indicator_padding_start"
            android:paddingEnd="@dimen/homepage_condition_header_indicator_padding_end"
            android:src="@drawable/ic_expand_more"/>
            android:src="@*android:drawable/ic_expand_more"/>

    </LinearLayout>

Loading