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

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

release-request-1b0d6769-ebfa-4e2d-b128-039ac0dcd5c9-for-git_oc-mr1-release-41... 

release-request-1b0d6769-ebfa-4e2d-b128-039ac0dcd5c9-for-git_oc-mr1-release-4140700 snap-temp-L81200000078275553

Change-Id: I27e788bbe2e22b5fdc38c398ac4e8d217e361644
parents b7512853 d5d4ae73

AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -924,6 +924,11 @@ 
                android:enabled="@*android:bool/config_nightDisplayAvailable"

                android:icon="@drawable/ic_settings_night_display"

                android:taskAffinity="">

            <intent-filter>

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

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

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

            </intent-filter>

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

                <action android:name="android.settings.NIGHT_DISPLAY_SETTINGS" />

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

res/drawable/ic_translate_24dp.xml

0 → 100644
+26 −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="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>

</vector>

res/drawable/search_panel_list_background.xml

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

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

-->



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

    android:inset="0dip">



    <color android:color="?android:attr/colorBackground" />



</inset>

res/layout-land/fingerprint_enroll_enrolling.xml

+13 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
                style="@style/SuwGlifIcon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="?attr/suwGlifHeaderGravity"

                android:layout_marginStart="0dp"

                android:layout_marginEnd="0dp"

                android:src="@drawable/ic_fingerprint_header" />
@@ -82,6 +83,18 @@ 


            </FrameLayout>



            <Space

                android:layout_width="0dp"

                android:layout_height="0dp"

                android:layout_weight="1" />



            <Button

                android:id="@+id/skip_button"

                style="@style/SuwGlifButton.Secondary"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/security_settings_fingerprint_enroll_enrolling_skip" />



        </LinearLayout>



        <FrameLayout

res/layout-land/fingerprint_enroll_find_sensor.xml

+10 −4
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 


            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_height="match_parent"

                android:orientation="vertical"

                android:clipChildren="false"

                android:clipToPadding="false">
@@ -52,6 +52,7 @@ 
                    style="@style/SuwGlifIcon"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="?attr/suwGlifHeaderGravity"

                    android:layout_marginStart="0dp"

                    android:layout_marginEnd="0dp"

                    android:src="@drawable/ic_fingerprint_header" />
@@ -70,13 +71,18 @@ 
                    android:layout_height="wrap_content"

                    android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>



                <Space

                    android:layout_width="0dp"

                    android:layout_height="0dp"

                    android:layout_weight="1" />



                <Button

                    style="@style/SetupWizardButton.Positive"

                    android:id="@+id/next_button"

                    style="@style/SetupWizardButton.Negative"

                    android:id="@+id/skip_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginTop="8dp"

                    android:text="@string/fingerprint_enroll_button_next" />

                    android:text="@string/skip_label" />



            </LinearLayout>