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

Commit 9e4647dc authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11211173 from accd9ca2 to 24Q1-release

Change-Id: I136d9ecada95c756509ff8859caa783110830497
parents 9fcfbf26 accd9ca2
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@
    <uses-permission android:name="android.permission.CUSTOMIZE_SYSTEM_UI" />
    <uses-permission android:name="android.permission.REMAP_MODIFIER_KEYS" />
    <uses-permission android:name="android.permission.ACCESS_GPU_SERVICE" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />

    <application
            android:name=".SettingsApplication"
@@ -491,6 +492,17 @@
                android:value="@string/menu_key_display"/>
        </activity>

        <activity android:name=".Settings$ScreenTimeoutActivity"
                  android:label="@string/screen_timeout"
                  android:exported="true">
            <intent-filter>
                <action android:name="android.settings.SCREEN_TIMEOUT_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                       android:value="com.android.settings.display.ScreenTimeoutSettings"/>
        </activity>

        <activity
            android:name="Settings$ConfigureWifiSettingsActivity"
            android:label="@string/wifi_configure_settings_preference_title"
+29 −0
Original line number Diff line number Diff line
<!--
    Copyright (C) 2020 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"
    android:tint="?android:attr/colorControlNormal"
    >

    <path
        android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
    <path
        android:fillColor="#FF000000"
        android:pathData="M20.17,14.85l-3.26-0.65c-0.33-0.07-0.67,0.04-0.9,0.27l-2.62,2.62c-2.75-1.49-5.01-3.75-6.5-6.5l2.62-2.62 c0.24-0.24,0.34-0.58,0.27-0.9L9.13,3.82c-0.09-0.47-0.5-0.8-0.98-0.8H4c-0.56,0-1.03,0.47-1,1.03c0.17,2.91,1.04,5.63,2.43,8.01 c1.57,2.69,3.81,4.93,6.5,6.5c2.38,1.39,5.1,2.26,8.01,2.43c0.56,0.03,1.03-0.44,1.03-1v-4.15C20.97,15.36,20.64,14.95,20.17,14.85 L20.17,14.85z M12,3v10l3-3h6V3H12z M19,8h-5V5h5V8z" />
</vector>
+6 −5
Original line number Diff line number Diff line
@@ -17,16 +17,17 @@

<FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="match_parent"
    android:layout_height="wrap_content">
    android:layout_height="wrap_content"
    android:orientation="vertical">

    <Button
        android:id="@+id/device_button"
        android:overScrollMode="never"
        style="@style/SettingsLibActionButton"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:textAlignment="center"
        android:text=""/>
        android:layout_marginTop="4dp"
        android:background="@drawable/audio_sharing_rounded_bg_ripple"
        android:textAlignment="center" />

</FrameLayout>
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@
        android:src="@drawable/audio_sharing_guidance"
        android:visibility="gone" />

    <com.android.internal.widget.RecyclerView
    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/btn_list"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
+4 −2
Original line number Diff line number Diff line
@@ -31,11 +31,13 @@
        android:layout_gravity="center"
        android:paddingBottom="24dp" />

    <com.android.internal.widget.RecyclerView
    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/device_btn_list"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="center" />
        android:layout_gravity="center"
        android:nestedScrollingEnabled="false"
        android:overScrollMode="never" />

    <Button
        android:id="@+id/cancel_btn"
Loading