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

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

Snap for 10850711 from ab895fdb to udc-qpr1-release

Change-Id: I458b29a2747d7223af8c9d157ec7b42921a7257f
parents 8416b224 ab895fdb
Loading
Loading
Loading
Loading
+25 −0
Original line number Diff line number Diff line
<!--
    Copyright (C) 2023 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="960"
        android:viewportHeight="960"
        android:tint="?attr/colorControlNormal">
    <path
        android:fillColor="@android:color/white"
        android:pathData="M320,880Q303,880 291.5,868.5Q280,857 280,840L280,200Q280,183 291.5,171.5Q303,160 320,160L400,160L400,80L560,80L560,160L640,160Q657,160 668.5,171.5Q680,183 680,200L680,840Q680,857 668.5,868.5Q657,880 640,880L320,880Z"/>
</vector>
+2 −0
Original line number Diff line number Diff line
@@ -2003,6 +2003,8 @@
    <string name="internet_source_mobile_data">Mobile data</string>
    <!-- Ethernet summary in Internet source preference [CHAR LIMIT=NONE]-->
    <string name="internet_source_ethernet">Ethernet</string>
    <!-- Hotspot device details battery charging summary [CHAR LIMIT=NONE]-->
    <string name="hotspot_battery_charging_summary"><xliff:g id="battery_percentage" example="80%">%s</xliff:g> \u2011 Charging</string>
    <!-- Hotspot device details preference category title in Network details [CHAR LIMIT=NONE]-->
    <string name="hotspot_connection_category">Hotspot connection</string>
    <!-- Connection strength preference in Hotspot connection preference category [CHAR LIMIT=NONE]-->
+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@
            settings:enableCopying="true"/>
        <Preference
            android:key="hotspot_device_details_battery"
            android:icon="@drawable/ic_battery_full"
            android:title="@string/power_usage_summary_title"
            android:selectable="false"
            settings:enableCopying="true"/>
+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public final class BatteryUsageDataLoader {
                    DatabaseUtils.sendBatteryUsageSlotData(context,
                            ConvertUtils.convertToBatteryUsageSlotList(batteryDiffDataMap));
                    if (batteryDiffDataMap.values().stream().anyMatch(data ->
                            (!data.getAppDiffEntryList().isEmpty()
                            data != null && (!data.getAppDiffEntryList().isEmpty()
                                    || !data.getSystemDiffEntryList().isEmpty()))) {
                        FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context)
                                .detectSettingsAnomaly(context, /* displayDrain= */ 0);
+0 −2
Original line number Diff line number Diff line
@@ -1034,8 +1034,6 @@ public class ChooseLockPassword extends SettingsActivity {
                    getActivity().getWindow().getDecorView());

            mPasswordEntryInputDisabler.setInputEnabled(false);
            setNextEnabled(false);

            mSaveAndFinishWorker = new SaveAndFinishWorker();
            mSaveAndFinishWorker
                    .setListener(this)
Loading