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

Commit aa8a972e authored by Bill Yi's avatar Bill Yi
Browse files

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

parents 2bcbc35b 3966912e

Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 
LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-v4 \

    android-support-v13 \

    android-support-v7-recyclerview \

    android-support-v7-preference \

    android-support-v7-appcompat \

    android-support-v7-cardview \

    android-support-v7-preference \

    android-support-v7-recyclerview \

    android-support-v14-preference



LOCAL_JAVA_LIBRARIES := \

AndroidManifest.xml

+231 −95

File changed.

Preview size limit exceeded, changes collapsed.

res/drawable/ic_music_note_vd_theme_24.xml→res/drawable/ic_accessibility_suggestion.xml

+6 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--

    Copyright (C) 2017 The Android Open Source Project
@@ -13,13 +14,13 @@ 
    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.0"

        android:viewportHeight="24.0"

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

        android:viewportHeight="24.0">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/>

        android:fillColor="#ff767c81"

        android:pathData="M9,4v3h5v12h3L17,7h5L22,4L9,4zM3,12h3v7h3v-7h3L12,9L3,9v3z"/>

</vector>

res/drawable/ic_add_24dp.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

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

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

    <path

        android:fillColor="@android:color/white"

        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>

res/drawable/ic_battery_alert_24dp.xml

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

  ~ Copyright (C) 2017 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.0"

        android:viewportHeight="24.0"

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

    <path

        android:fillColor="#FF000000"

        android:pathData="M15.67,4L14,4L14,2h-4v2L8.33,4C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33L17,5.33C17,4.6 16.4,4 15.67,4zM13,18h-2v-2h2v2zM13,14h-2L11,9h2v5z"/>

</vector>