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

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

Snap for 6420265 from 3c4b5d2a to rvc-release 

Change-Id: Iba0889e4551dfe6f81904dfbf3b1f45b88f31b36
parents a51de753 3c4b5d2a

res/layout/accessibility_autoclick_custom_seekbar.xml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal"

        android:accessibilityLiveRegion="polite"

        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView" />



    <LinearLayout

res/layout/face_enroll_accessibility_toggle.xml

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
        android:paddingTop="8dp"

        android:gravity="start"

        android:layout_alignParentStart="true"

        android:layout_toLeftOf="@+id/toggle"

        android:layout_toStartOf="@+id/toggle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content" />
@@ -46,7 +46,7 @@ 
        android:paddingHorizontal="8dp"

        android:paddingBottom="8dp"

        android:layout_alignParentStart="true"

        android:layout_toLeftOf="@+id/toggle"

        android:layout_toStartOf="@+id/toggle"

        android:layout_below="@+id/title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

res/layout/panel_layout.xml

+4 −4
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ 
            android:visibility="gone">



            <LinearLayout

                android:layout_width="49dp"

                android:layout_height="49dp"

                android:layout_width="36dp"

                android:layout_height="36dp"

                android:gravity="center_vertical|center_horizontal"

                android:orientation="horizontal"

                android:layout_marginStart="10dp">

                android:layout_marginStart="16dp">

                <ImageView

                    android:id="@+id/title_icon"

                    android:layout_height="wrap_content"
@@ -50,7 +50,7 @@ 
            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginStart="25dp"

                android:layout_marginStart="16dp"

                android:gravity="center_vertical"

                android:orientation="vertical"

                android:paddingBottom="9dp"

res/layout/panel_slice_slider_row.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,6 +25,6 @@ 
        style="@style/SliceViewSliderStyle"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="8dp"

        android:paddingEnd="8dp"/>

        android:paddingStart="0dp"

        android:paddingEnd="0dp"/>

</LinearLayout>
 
 No newline at end of file

res/values/strings.xml

+25 −0
Original line number Diff line number Diff line
@@ -3776,14 +3776,31 @@ 
    <string name="tether_settings_summary_usb_tethering_only">USB only</string>

    <!-- Tethering setting summary when only Bluetooth tethering is on [CHAR LIMIT=NONE]-->

    <string name="tether_settings_summary_bluetooth_tethering_only">Bluetooth only</string>

    <!-- Tethering setting summary when only Ethernet tethering is on [CHAR LIMIT=NONE]-->

    <string name="tether_settings_summary_ethernet_tethering_only">Ethernet only</string>

    <!-- Tethering setting summary when Wi-Fi hotspot and USB tethering are on [CHAR LIMIT=NONE]-->

    <string name="tether_settings_summary_hotspot_and_usb">Hotspot, USB</string>

    <!-- Tethering setting summary when Wi-Fi hotspot and Bluetooth tethering are on [CHAR LIMIT=NONE]-->

    <string name="tether_settings_summary_hotspot_and_bluetooth">Hotspot, Bluetooth</string>

    <!-- Tethering setting summary when Wi-Fi hotspot and Ethernet tethering are on [CHAR LIMIT=NONE]-->

    <string name="tether_settings_summary_hotspot_and_ethernet">Hotspot, Ethernet</string>

    <!-- Tethering setting summary when USB and Bluetooth tethering are on [CHAR LIMIT=NONE]-->

    <string name="tether_settings_summary_usb_and_bluetooth">USB, Bluetooth</string>

    <!-- Tethering setting summary when USB and Ethernet tethering are on [CHAR LIMIT=NONE]-->

    <string name="tether_settings_summary_usb_and_ethernet">USB, Ethernet</string>

    <!-- Tethering setting summary when Bluetooth and Ethernet tethering are on [CHAR LIMIT=NONE]-->

    <string name="tether_settings_summary_bluetooth_and_ethernet">Bluetooth, Ethernet</string>

    <!-- Tethering setting summary when Wi-Fi hotspot and USB and Bluetooth tethering are on [CHAR LIMIT=NONE]-->

    <string name="tether_settings_summary_hotspot_and_usb_and_bluetooth">Hotspot, USB, Bluetooth</string>

    <!-- Tethering setting summary when Wi-Fi hotspot and USB and Ethernet tethering are on [CHAR LIMIT=NONE]-->

    <string name="tether_settings_summary_hotspot_and_usb_and_ethernet">Hotspot, USB, Ethernet</string>

    <!-- Tethering setting summary when Wi-Fi hotspot and Bluetooth and Ethernet tethering are on [CHAR LIMIT=NONE]-->

    <string name="tether_settings_summary_hotspot_and_bluetooth_and_ethernet">Hotspot, Bluetooth, Ethernet</string>

    <!-- Tethering setting summary when USB and Bluetooth and Ethernet tethering are on [CHAR LIMIT=NONE]-->

    <string name="tether_settings_summary_usb_and_bluetooth_and_ethernet">USB, Bluetooth, Ethernet</string>

    <!-- Tethering setting summary when Wi-Fi hotspot and USB and Bluetooth and Ethernet tethering are on [CHAR LIMIT=NONE]-->

    <string name="tether_settings_summary_all">Hotspot, USB, Bluetooth, Ethernet</string>









    <!-- Tethering setting summary when hotspot and tethering are off [CHAR LIMIT=NONE]-->









    <string name="tether_settings_summary_off">Not sharing internet with other devices</string>
















@@ -3797,8 +3814,16 @@







    <string name="disable_wifi_hotspot_when_usb_on">Only share internet via USB</string>









    <!-- Don't use Wi-Fi hotspot summary when Bluetooth tethering is chosen [CHAR LIMIT=NONE]-->









    <string name="disable_wifi_hotspot_when_bluetooth_on">Only share internet via Bluetooth</string>









    <!-- Don't use Wi-Fi hotspot summary when Ethernet tethering is chosen [CHAR LIMIT=NONE]-->









    <string name="disable_wifi_hotspot_when_ethernet_on">Only share internet via Ethernet</string>









    <!-- Don't use Wi-Fi hotspot summary when USB tethering and Bluetooth tethering are chosen [CHAR LIMIT=NONE]-->









    <string name="disable_wifi_hotspot_when_usb_and_bluetooth_on">Only share internet via USB and Bluetooth</string>









    <!-- Don't use Wi-Fi hotspot summary when USB tethering and Ethernet tethering are chosen [CHAR LIMIT=NONE]-->









    <string name="disable_wifi_hotspot_when_usb_and_ethernet_on">Only share internet via USB and Ethernet</string>









    <!-- Don't use Wi-Fi hotspot summary when Bluetooth tethering and Ethernet tethering are chosen [CHAR LIMIT=NONE]-->









    <string name="disable_wifi_hotspot_when_bluetooth_and_ethernet_on">Only share internet via Bluetooth and Ethernet</string>









    <!-- Don't use Wi-Fi hotspot summary when USB, Bluetooth and Ethernet tethering are chosen [CHAR LIMIT=NONE]-->









    <string name="disable_wifi_hotspot_when_usb_and_bluetooth_and_ethernet_on">Only share internet via USB, Bluetooth and Ethernet</string>

















    <!-- USB Tethering options -->









    <string name="usb_title">USB</string>