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

Commit 8af8e969 authored by Austin Wang's avatar Austin Wang
Browse files

Using google gray 700 color for "From this week" and "Large files" chips 

Fixes:137847802
Fixes:137846543
Test: manual
Test: atest DocumentsUIGoogleTests:SearchChipViewManagerTest
Change-Id: I9a71b09c76b37df3b858b84c8fb92d8ccfd63f9f
parent c2f01387

res/drawable/ic_chip_from_this_week.xml

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

<!--

  ~ Copyright (C) 2019 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">

    <path

        android:fillColor="#5F6368"

        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l4,3.99L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.25,2.52 0.77,-1.28 -3.52,-2.09L13.5,8z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_chip_large_files.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ 
        android:viewportWidth="24"

        android:viewportHeight="24">

    <path

        android:fillColor="?android:textColorSecondary"

        android:fillColor="#5F6368"

        android:pathData="M21.41,11.58l-9,-9C12.05,2.22 11.55,2 11,2H4c-1.1,0 -2,0.9 -2,2v7c0,0.55 0.22,1.05 0.59,1.42l9,9c0.36,0.36 0.86,0.58 1.41,0.58s1.05,-0.22 1.41,-0.59l7,-7c0.37,-0.36 0.59,-0.86 0.59,-1.41s-0.23,-1.06 -0.59,-1.42zM13,20.01L4,11V4h7v-0.01l9,9 -7,7.02zM8,6.5C8,7.33 7.33,8 6.5,8S5,7.33 5,6.5 5.67,5 6.5,5 8,5.67 8,6.5z"/>

</vector>
 
 No newline at end of file

src/com/android/documentsui/queries/SearchChipViewManager.java

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ public class SearchChipViewManager { 
        if (chipData.getChipType() == TYPE_LARGE_FILES) {

            chipIcon = context.getDrawable(R.drawable.ic_chip_large_files);

        } else if (chipData.getChipType() == TYPE_FROM_THIS_WEEK) {

            chipIcon = context.getDrawable(R.drawable.ic_history);

            chipIcon = context.getDrawable(R.drawable.ic_chip_from_this_week);

        } else {

            // get the icon drawable with the first mimeType in chipData

            chipIcon = IconUtils.loadMimeIcon(context, chipData.getMimeTypes()[0]);