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

Commit eb0c9769 authored by Fan Zhang's avatar Fan Zhang
Browse files

Update misc settingslib icons 

- new icon size for edit pencil
- removed home.xml, it's not needed by anything except test

Bug: 77982107
Test: visual
Change-Id: I451bc12c4a57e5f61e7c561c394b00bd95e7228d
parent 01f41f96

packages/SettingsLib/res/drawable/home.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2016 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="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorAccent">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M10.0,20.0l0.0,-6.0l4.0,0.0l0.0,6.0l5.0,0.0l0.0,-8.0l3.0,0.0L12.0,3.0 2.0,12.0l3.0,0.0l0.0,8.0z"/>

</vector>

packages/SettingsLib/res/drawable/ic_mode_edit.xml

+15 −14
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2017 The Android Open Source Project

  Copyright (C) 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.
@@ -13,13 +13,14 @@ 
  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="20.0dp"

        android:height="20.0dp"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FFFFFFFF"

        android:fillColor="#FFFFFF"

        android:pathData="M20.41,4.94l-1.35,-1.35c-0.78,-0.78 -2.05,-0.78 -2.83,0l0,0L3,16.82V21h4.18L20.41,7.77C21.2,6.99 21.2,5.72 20.41,4.94zM6.41,19.06L5,19v-1.36l9.82,-9.82l1.41,1.41L6.41,19.06z"/>

</vector>

packages/SettingsLib/tests/integ/src/com/android/settingslib/drawable/UserIconDrawableTest.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ public class UserIconDrawableTest { 
    public void getConstantState_shouldNotBeNull() {

        final Bitmap b = BitmapFactory.decodeResource(

                InstrumentationRegistry.getTargetContext().getResources(),

                R.drawable.home);

                R.drawable.ic_mode_edit);

        mDrawable = new UserIconDrawable(100 /* size */).setIcon(b).bake();



        assertThat(mDrawable.getConstantState()).isNotNull();