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

Commit 154d5e78 authored by Xin Li's avatar Xin Li
Browse files

Merge commit '93eb2c91' from 

oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: I0b2adc21234cda517b80a5afa4dfc57d749edec2
Merged-In: Ie956f68c7827b87cd51659ca035478bd11cee7b6
parents b14cc5cb 93eb2c91

AndroidManifest.xml

+4 −3
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@ 
    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-permission android:name="android.permission.CACHE_CONTENT" />

    <uses-permission android:name="android.permission.CACHE_CONTENT" />

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="android.permission.SET_PREFERRED_APPLICATIONS" />





    <application

    <application

        android:name=".DocumentsApplication"

        android:name=".DocumentsApplication"
@@ -57,9 +58,8 @@ 
        </activity>

        </activity>





        <activity

        <activity

            android:enabled="false"

            android:name=".inspector.InspectorActivity"

            android:name=".inspector.DocumentInspectorActivity"

            android:label="@string/menu_inspector"

            android:label="Properties"

            android:icon="@drawable/launcher_icon"

            android:icon="@drawable/launcher_icon"

            android:theme="@style/DocumentsTheme">

            android:theme="@style/DocumentsTheme">

        </activity>

        </activity>
@@ -68,6 +68,7 @@ 
        <activity-alias

        <activity-alias

            android:name=".LauncherActivity"

            android:name=".LauncherActivity"

            android:targetActivity=".files.LauncherActivity"

            android:targetActivity=".files.LauncherActivity"

            android:enabled="@bool/is_launcher_enabled"

            android:label="@string/launcher_label"

            android:label="@string/launcher_label"

            android:icon="@drawable/launcher_icon" >

            android:icon="@drawable/launcher_icon" >

            <intent-filter>

            <intent-filter>

res/drawable/ic_action_clear.xml

0 → 100644
+24 −0
Original line number Original line 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">

  <path

      android:fillColor="#FF737373"

      android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_action_open.xml

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

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

  <path

      android:fillColor="#FF737373"

      android:pathData="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_usb_shortcut.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -19,13 +19,13 @@ 
    <background android:drawable="@color/shortcut_background" />

    <background android:drawable="@color/shortcut_background" />

    <foreground>

    <foreground>

        <inset android:inset="33%">

        <inset android:inset="33%">

            <vector

            <vector xmlns:android="http://schemas.android.com/apk/res/android"

                android:width="24dp"

                android:width="24dp"

                android:height="24dp"

                android:height="24dp"

                android:viewportWidth="24.0"

                android:viewportHeight="24"

                android:viewportHeight="24.0">

                android:viewportWidth="24">

                <path

                <path

                    android:fillColor="@color/ic_shorcut_foreground"

                    android:fillColor="@color/shortcut_foreground"

                    android:pathData="M15 7v4h1v2h-3V5h2l-3,-4,-3 4h2v8H8v-2.07c.7,-.37 1.2,-1.08 1.2,-1.93 0,-1.21,-.99,-2.2,-2.2,-2.2,-1.21 0,-2.2.99,-2.2 2.2 0 .85.5 1.56 1.2 1.93V13c0 1.11.89 2 2 2h3v3.05c-.71.37,-1.2 1.1,-1.2 1.95 0 1.22.99 2.2 2.2 2.2 1.21 0 2.2,-.98 2.2,-2.2 0,-.85,-.49,-1.58,-1.2,-1.95V15h3c1.11 0 2,-.89 2,-2v-2h1V7h-4z"/>

                    android:pathData="M15 7v4h1v2h-3V5h2l-3,-4,-3 4h2v8H8v-2.07c.7,-.37 1.2,-1.08 1.2,-1.93 0,-1.21,-.99,-2.2,-2.2,-2.2,-1.21 0,-2.2.99,-2.2 2.2 0 .85.5 1.56 1.2 1.93V13c0 1.11.89 2 2 2h3v3.05c-.71.37,-1.2 1.1,-1.2 1.95 0 1.22.99 2.2 2.2 2.2 1.21 0 2.2,-.98 2.2,-2.2 0,-.85,-.49,-1.58,-1.2,-1.95V15h3c1.11 0 2,-.89 2,-2v-2h1V7h-4z"/>

            </vector>

            </vector>

        </inset>

        </inset>

res/layout/document_inspector_activity.xml

+3 −4
Original line number Original line Diff line number Diff line
@@ -30,11 +30,10 @@ 
        android:popupTheme="?actionBarPopupTheme">

        android:popupTheme="?actionBarPopupTheme">

    </Toolbar>

    </Toolbar>





    <fragment

    <FrameLayout

        android:name="com.android.documentsui.inspector.DocumentInspectorFragment"

        android:id="@+id/fragment_container"

        android:id="@+id/properties_fragment"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        android:layout_height="match_parent">

    </fragment>

    </FrameLayout>





</LinearLayout>
 
</LinearLayout>