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

Commit d79b72d2 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-e64ca0c4-2b43-4758-b238-0b8c6fabc365-for-git_oc-mr1-release-42... 

release-request-e64ca0c4-2b43-4758-b238-0b8c6fabc365-for-git_oc-mr1-release-4207446 snap-temp-L19600000085022555

Change-Id: I2715d276c5a37bd52073248c938c876560b7daa9
parents 9343134e 6cd295af

AndroidManifest.xml

+8 −8
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ 
        </activity>



        <activity android:name=".Settings$LanguageAndInputSettingsActivity"

            android:label="@string/language_input_gesture_title"

            android:label="@string/language_settings"

            android:icon="@drawable/ic_settings_language"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings$SystemDashboardActivity">
@@ -2474,7 +2474,7 @@ 
                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.DreamSettings" />

                android:value="com.android.settings.dream.DreamSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>
@@ -3131,7 +3131,7 @@ 
        <activity android:name=".support.SupportDashboardActivity"

                  android:label="@string/page_tab_title_support"

                  android:icon="@drawable/ic_help"

                  android:theme="@android:style/Theme.NoDisplay"

                  android:theme="@android:style/Theme.DeviceDefault.Light.Panel"

                  android:enabled="@bool/config_support_enabled">

            <intent-filter android:priority="-2">

                <action android:name="com.android.settings.action.SETTINGS"/>
@@ -3211,7 +3211,7 @@ 
        <activity

            android:name=".Settings$DoubleTapPowerSuggestionActivity"

            android:label="@string/double_tap_power_for_camera_title"

            android:icon="@drawable/ic_suggestion_gesture">

            android:icon="@drawable/ic_settings_gestures">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.GESTURE" />
@@ -3233,7 +3233,7 @@ 
        <activity

            android:name=".Settings$DoubleTwistSuggestionActivity"

            android:label="@string/double_twist_for_camera_mode_title"

            android:icon="@drawable/ic_suggestion_gesture">

            android:icon="@drawable/ic_settings_gestures">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.GESTURE" />
@@ -3255,7 +3255,7 @@ 
        <activity

            android:name=".Settings$AmbientDisplaySuggestionActivity"

            android:label="@string/ambient_display_title"

            android:icon="@drawable/ic_suggestion_gesture">

            android:icon="@drawable/ic_settings_gestures">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.GESTURE" />
@@ -3277,7 +3277,7 @@ 
        <activity

            android:name=".Settings$AmbientDisplayPickupSuggestionActivity"

            android:label="@string/ambient_display_pickup_title"

            android:icon="@drawable/ic_suggestion_gesture">

            android:icon="@drawable/ic_settings_gestures">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.GESTURE" />
@@ -3299,7 +3299,7 @@ 
        <activity

            android:name=".Settings$SwipeToNotificationSuggestionActivity"

            android:label="@string/fingerprint_swipe_for_notifications_title"

            android:icon="@drawable/ic_suggestion_gesture">

            android:icon="@drawable/ic_settings_gestures">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.GESTURE" />

res/drawable/ic_bt_imaging.xml

deleted100644 → 0
+0 −27
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="24dp"

    android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

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

    <path

        android:fillColor="#FF000000"

        android:pathData="M19,8L5,8c-1.66,0 -3,1.34 -3,3v6h4v4h12v-4h4v-6c0,-1.66 -1.34,-3

            -3,-3zM16,19L8,19v-5h8v5zM19,12c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1

            -1,1zM18,3L6,3v4h12L18,3z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_settings_gestures.xml

+6 −3
Original line number Diff line number Diff line
@@ -16,10 +16,13 @@ 
<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:viewportWidth="32.0"

        android:viewportHeight="32.0"

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

    <path

        android:fillColor="#FF000000"

        android:pathData="M9,11.24L9,7.5C9,6.12 10.12,5 11.5,5S14,6.12 14,7.5v3.74c1.21,-0.81 2,-2.18 2,-3.74C16,5.01 13.99,3 11.5,3S7,5.01 7,7.5c0,1.56 0.79,2.93 2,3.74zM18.84,15.87l-4.54,-2.26c-0.17,-0.07 -0.35,-0.11 -0.54,-0.11L13,13.5v-6c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,6.67 10,7.5v10.74l-3.43,-0.72c-0.08,-0.01 -0.15,-0.03 -0.24,-0.03 -0.31,0 -0.59,0.13 -0.79,0.33l-0.79,0.8 4.94,4.94c0.27,0.27 0.65,0.44 1.06,0.44h6.79c0.75,0 1.33,-0.55 1.44,-1.28l0.75,-5.27c0.01,-0.07 0.02,-0.14 0.02,-0.2 0,-0.62 -0.38,-1.16 -0.91,-1.38z"/>

        android:pathData="M20,20.2V24H6V5.3h8.7l2.4,-4H7.6c-2.2,0 -4,1.8 -4,4v21.3c0,2.2 1.8,4 4,4h10.7c2.2,0 4,-1.8 4,-4V14.9L20,20.2zM15.6,28h-5.3v-1.3h5.3V28z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M28.5,7l1.1,-2.4L32,3.5l-2.4,-1.1L28.5,0l-1.1,2.4L25,3.5l2.4,1.1L28.5,7zM21,7.4l-2.2,-4.8l-2.2,4.8l-4.8,2.2l4.8,2.2l2.2,4.8l2.2,-4.8l4.8,-2.2L21,7.4zM28.5,12.2l-1.1,2.4L25,15.6l2.4,1.1l1.1,2.4l1.1,-2.4l2.4,-1.1l-2.4,-1.1L28.5,12.2z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_suggestion_gesture.xml

deleted100644 → 0
+0 −28
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="32.0"

    android:viewportHeight="32.0"

    android:autoMirrored="true">

    <path

        android:fillColor="@color/material_grey_600"

        android:pathData="M20,20.2V24H6V5.3h8.7l2.4,-4H7.6c-2.2,0 -4,1.8 -4,4v21.3c0,2.2 1.8,4 4,4h10.7c2.2,0 4,-1.8 4,-4V14.9L20,20.2zM15.6,28h-5.3v-1.3h5.3V28z"/>

    <path

        android:fillColor="@color/material_grey_600"

        android:pathData="M28.5,7l1.1,-2.4L32,3.5l-2.4,-1.1L28.5,0l-1.1,2.4L25,3.5l2.4,1.1L28.5,7zM21,7.4l-2.2,-4.8l-2.2,4.8l-4.8,2.2l4.8,2.2l2.2,4.8l2.2,-4.8l4.8,-2.2L21,7.4zM28.5,12.2l-1.1,2.4L25,15.6l2.4,1.1l1.1,2.4l1.1,-2.4l2.4,-1.1l-2.4,-1.1L28.5,12.2z"/>

</vector>

res/layout/search_panel.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    android:orientation="vertical">



    <FrameLayout

        android:id="@+id/search_bar_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@color/suggestion_condition_background">