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

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

release-request-46bf7ca6-57e7-44b8-8edc-ea8830c1cb3b-for-git_oc-mr1-release-40... 

release-request-46bf7ca6-57e7-44b8-8edc-ea8830c1cb3b-for-git_oc-mr1-release-4090244 snap-temp-L07700000073092334

Change-Id: I4d508fd59393913fae052fd58363a316d26b5a8f
parents cdeac388 446f2d28

AndroidManifest.xml

+7 −3
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ 
        </activity>



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

            android:label="@string/language_keyboard_settings_title"

            android:label="@string/language_input_gesture_title"

            android:icon="@drawable/ic_settings_language"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings$SystemDashboardActivity">
@@ -619,7 +619,7 @@ 


        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name="LanguageSettings"

                android:label="@string/language_keyboard_settings_title"

                android:label="@string/language_input_gesture_title"

                android:clearTaskOnLaunch="true"

                android:exported="true"

                android:targetActivity="Settings$LanguageAndInputSettingsActivity">
@@ -1548,7 +1548,7 @@ 
            android:icon="@drawable/ic_suggested_notifications">

            <intent-filter>

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

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

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

            </intent-filter>

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

                       android:value="primary" />
@@ -3038,6 +3038,10 @@ 
            <intent-filter android:priority="-2">

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SUPPORT_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

                       android:value="com.android.settings.category.ia.homepage"/>

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

res/drawable/ic_headset_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/colorControlNormal">

    <path

        android:fillColor="#FF000000"

        android:pathData="M11.4,1.02C6.62,1.33 3,5.52 3,10.31v5.89C3,18.66 4.34,20 6,20h2c0.55,0 1,-0.45 1,-1v-6c0,-0.55 -0.45,-1 -1,-1H5v-1.71C5,6.45 7.96,3.11 11.79,3 15.76,2.89 19,6.06 19,10v2h-3c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h2c1.66,0 3,-1.34 3,-3v-7c0,-5.17 -4.36,-9.32 -9.6,-8.98z"/>

</vector>

res/drawable/ic_media_stream_on_24dp.xml

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

<!--

  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="#FF000000"

        android:pathData="M18,3h-5c-0.55,0 -1,0.45 -1,1v8.3a3.88,3.88 0,0 0,-2.9 -0.04c-1.79,0.67 -3.11,2.35 -3.1,4.26A4.483,4.483 0,0 0,10.5 21c2.5,0 4.5,-2.3 4.5,-4.5V6h3c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1z"/>

</vector>

res/layout/preference_linearcolor.xml

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

<!-- Copyright (C) 2010 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.

-->



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

        android:layout_width="match_parent"

        android:layout_height="?android:attr/listPreferredItemHeight"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

    <com.android.settings.applications.LinearColorBar

        android:id="@+id/linear_color_bar"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginTop="16dp"

        android:layout_marginBottom="16dp"

        android:gravity="center_vertical"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:shadowRadius="4"

        android:shadowColor="?android:attr/colorBackground"

        android:shadowDx="2"

        android:shadowDy="2">

    </com.android.settings.applications.LinearColorBar>



</FrameLayout>
 
 No newline at end of file

res/layout/settings_summary_preference.xml

+2 −1
Original line number Diff line number Diff line
@@ -26,9 +26,10 @@ 
        android:id="@android:id/title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="0dp"

        android:layout_marginTop="0dp"

        android:layout_marginBottom="5dp"

        android:fontFamily="@*android:string/config_headlineFontFamily"

        android:paddingTop="0dp"

        android:textColor="?android:attr/colorAccent"

        android:textAppearance="@android:style/TextAppearance.Material.Display1"

        />