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

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

Snap for 7012656 from 99fe8f30 to rvc-qpr2-release 

Change-Id: I0ce9912cb072d3b881279ac7fb5e3cf94af1c2f9
parents 0810d196 99fe8f30

cmds/statsd/src/atoms.proto

+6 −0
Original line number Diff line number Diff line
@@ -3661,6 +3661,12 @@ message AppStartFullyDrawn { 


    // App startup time (until call to Activity#reportFullyDrawn()).

    optional int64 app_startup_time_millis = 6;



    // The compiler filter used when when the package was optimized.

    optional int32 package_optimization_compilation_filter = 7;



    // The reason why the package was optimized.

    optional int32 package_optimization_compilation_reason = 8;

}



/**

core/java/android/content/pm/CrossProfileApps.java

+6 −4
Original line number Diff line number Diff line
@@ -119,8 +119,9 @@ public class CrossProfileApps { 
     *        {@link #getTargetUserProfiles()} if different to the calling user, otherwise a

     *        {@link SecurityException} will be thrown.

     * @param callingActivity The activity to start the new activity from for the purposes of

     *        deciding which task the new activity should belong to. If {@code null}, the activity

     *        will always be started in a new task.

     *        passing back any result and deciding which task the new activity should belong to. If

     *        {@code null}, the activity will always be started in a new task and no result will be

     *        returned.

     */

    @RequiresPermission(anyOf = {

            android.Manifest.permission.INTERACT_ACROSS_PROFILES,
@@ -146,8 +147,9 @@ public class CrossProfileApps { 
     *        {@link #getTargetUserProfiles()} if different to the calling user, otherwise a

     *        {@link SecurityException} will be thrown.

     * @param callingActivity The activity to start the new activity from for the purposes of

     *        deciding which task the new activity should belong to. If {@code null}, the activity

     *        will always be started in a new task.

     *        passing back any result and deciding which task the new activity should belong to. If

     *        {@code null}, the activity will always be started in a new task and no result will be

     *        returned.

     * @param options The activity options or {@code null}. See {@link android.app.ActivityOptions}.

     */

    @RequiresPermission(anyOf = {

packages/CarSystemUI/res/drawable/navigation_bar_button_bg.xml

0 → 100644
+34 −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.

  -->

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

    <item android:state_focused="true">

        <shape android:shape="oval">

            <solid android:color="@color/car_ui_rotary_focus_fill_color"/>

            <stroke android:width="@dimen/car_ui_rotary_focus_stroke_width"

                    android:color="@color/car_ui_rotary_focus_stroke_color"/>

        </shape>

    </item>

    <item>

        <ripple android:color="@color/car_ui_ripple_color">

            <item android:id="@android:id/mask">

                <shape android:shape="oval">

                    <solid android:color="@android:color/white"/>

                </shape>

            </item>

        </ripple>

    </item>

</selector>

packages/CarSystemUI/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,6 +40,6 @@ 
    <style name="NavigationBarButton">

        <item name="android:layout_height">96dp</item>

        <item name="android:layout_width">96dp</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>

        <item name="android:background">@drawable/navigation_bar_button_bg</item>

    </style>

</resources>
 
 No newline at end of file

packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationButton.java

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ public class CarNavigationButton extends LinearLayout { 
        if (mHighlightWhenSelected) {

            // Always apply selected alpha if the button does not toggle alpha based on selection

            // state.

            setAlpha(!mHighlightWhenSelected || mSelected ? mSelectedAlpha : mUnselectedAlpha);

            mIcon.setAlpha(

                    !mHighlightWhenSelected || mSelected ? mSelectedAlpha : mUnselectedAlpha);

        }

        if (mShowMoreWhenSelected && mMoreIcon != null) {

            mMoreIcon.setVisibility(selected ? VISIBLE : GONE);