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

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

Snap for 6984282 from c9e117ed to rvc-qpr2-release

Change-Id: I0e6fea7c90530bb8517f6039673ddf9e01520edb
parents 2bae306f c9e117ed
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -163,3 +163,10 @@ prebuilt_etc {
    src: "com.android.car.ui.paintbooth.xml",
    filename_from_src: true,
}

prebuilt_etc {
    name: "allowed_privapp_com.android.carshell",
    sub_dir: "permissions",
    src: "com.android.car.shell.xml",
    filename_from_src: true,
}
+22 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ 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
  -->
<permissions>
    <privapp-permissions package="com.android.car.shell">
        <permission name="android.permission.INSTALL_PACKAGES" />
        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
    </privapp-permissions>
</permissions>
+3 −4
Original line number Diff line number Diff line
@@ -45,14 +45,13 @@
        app:layout_constraintBottom_toBottomOf="@+id/gradient_edge"
        app:layout_constraintTop_toTopOf="parent"/>

    <FrameLayout
    <com.android.car.notification.headsup.HeadsUpContainerView
        android:id="@+id/headsup_content"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/headsup_notification_top_margin"
        app:layout_constraintEnd_toStartOf="parent"
        app:layout_constraintStart_toEndOf="parent"
        app:layout_constraintBottom_toBottomOf="parent"
    />
        app:layout_constraintBottom_toBottomOf="parent"/>

</androidx.constraintlayout.widget.ConstraintLayout>
+2 −0
Original line number Diff line number Diff line
@@ -1100,6 +1100,8 @@
    <string name="power_remaining_charging_duration_only"><xliff:g id="time">%1$s</xliff:g> left until charged</string>
    <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
    <string name="power_charging_duration"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="time">%2$s</xliff:g> until charged</string>
    <!-- [CHAR_LIMIT=40] Label for battery level chart when charge been limited -->
    <string name="power_charging_limited"><xliff:g id="level">%1$s</xliff:g> - Battery limited temporarily</string>

    <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
    <string name="battery_info_status_unknown">Unknown</string>
+3 −0
Original line number Diff line number Diff line
@@ -79,6 +79,9 @@
         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
    <string name="keyguard_plugged_in_charging_slowly"><xliff:g id="percentage">%s</xliff:g> • Charging slowly</string>

    <!-- When the lock screen is showing and the phone plugged in, and the defend mode is triggered, say that it's limited temporarily.  -->
    <string name="keyguard_plugged_in_charging_limited"><xliff:g id="percentage">%s</xliff:g> • Battery limited temporarily</string>

    <!-- When the lock screen is showing and the battery is low, warn user to plug
         in the phone soon. -->
    <string name="keyguard_low_battery">Connect your charger.</string>
Loading