Merge "Import translations. DO NOT MERGE ANYWHERE" into main
diff --git a/res/layout/qc_status_icons_horizontal.xml b/res/layout/qc_status_icons_horizontal.xml
index 02757ff..8a3d3e6 100644
--- a/res/layout/qc_status_icons_horizontal.xml
+++ b/res/layout/qc_status_icons_horizontal.xml
@@ -85,14 +85,16 @@
systemui:panelLayoutRes="@layout/qc_display_panel"
systemui:disabledWhileUnprovisioned="true"
systemui:systemBarDisable2Flags="quickSettings">
- <com.android.systemui.car.statusicon.StatusIconView
+ <!-- Simplify by using ImageView instead of StatusIconView since this icon is not dynamic. -->
+ <ImageView
android:id="@+id/display_status_icon"
android:layout_width="@dimen/car_quick_controls_icon_drawable_width"
android:layout_height="@dimen/car_quick_controls_icon_drawable_height"
android:layout_gravity="center"
android:tint="@color/car_status_icon_color"
android:duplicateParentState="true"
- systemui:controller="com.android.systemui.car.statusicon.ui.DisplayStatusIconController"/>
+ android:src="@drawable/car_ic_brightness"
+ android:contentDescription="@string/status_icon_display_status"/>
</com.android.systemui.car.systembar.CarSystemBarPanelButtonView>
<com.android.systemui.car.systembar.CarSystemBarPanelButtonView
android:id="@+id/volume_panel"
diff --git a/res/layout/qc_status_icons_vertical.xml b/res/layout/qc_status_icons_vertical.xml
index 6196789..4612264 100644
--- a/res/layout/qc_status_icons_vertical.xml
+++ b/res/layout/qc_status_icons_vertical.xml
@@ -85,14 +85,15 @@
systemui:panelLayoutRes="@layout/qc_display_panel"
systemui:disabledWhileUnprovisioned="true"
systemui:systemBarDisable2Flags="quickSettings">
- <com.android.systemui.car.statusicon.StatusIconView
+ <ImageView
android:id="@+id/display_status_icon"
android:layout_width="@dimen/car_quick_controls_icon_drawable_width"
android:layout_height="@dimen/car_quick_controls_icon_drawable_height"
android:layout_gravity="center"
android:tint="@color/car_status_icon_color"
android:duplicateParentState="true"
- systemui:controller="com.android.systemui.car.statusicon.ui.DisplayStatusIconController"/>
+ android:src="@drawable/car_ic_brightness"
+ android:contentDescription="@string/status_icon_display_status"/>
</com.android.systemui.car.systembar.CarSystemBarPanelButtonView>
<com.android.systemui.car.systembar.CarSystemBarPanelButtonView
android:id="@+id/volume_panel"
diff --git a/src/com/android/systemui/car/statusicon/ui/DisplayStatusIconController.java b/src/com/android/systemui/car/statusicon/ui/DisplayStatusIconController.java
deleted file mode 100644
index 84d5f35..0000000
--- a/src/com/android/systemui/car/statusicon/ui/DisplayStatusIconController.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2021 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.
- */
-
-package com.android.systemui.car.statusicon.ui;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-
-import com.android.systemui.R;
-import com.android.systemui.car.statusicon.StatusIconView;
-import com.android.systemui.car.statusicon.StatusIconViewController;
-import com.android.systemui.car.systembar.element.CarSystemBarElementStateController;
-import com.android.systemui.car.systembar.element.CarSystemBarElementStatusBarDisableController;
-import com.android.systemui.dagger.qualifiers.Main;
-
-import dagger.assisted.Assisted;
-import dagger.assisted.AssistedFactory;
-import dagger.assisted.AssistedInject;
-
-/**
- * A controller for Display status icon.
- */
-public class DisplayStatusIconController extends StatusIconViewController {
-
- private final Drawable mDisplayBrightnessDrawable;
- private final String mDisplayBrightnessContentDescription;
-
- @AssistedInject
- DisplayStatusIconController(
- @Assisted StatusIconView view,
- CarSystemBarElementStatusBarDisableController disableController,
- CarSystemBarElementStateController stateController,
- Context context, @Main Resources resources) {
- super(view, disableController, stateController);
- mDisplayBrightnessDrawable = resources.getDrawable(R.drawable.car_ic_brightness,
- context.getTheme());
- mDisplayBrightnessContentDescription = resources.getString(
- R.string.status_icon_display_status);
- updateStatus();
- }
-
- @AssistedFactory
- public interface Factory extends
- StatusIconViewController.Factory<DisplayStatusIconController> {
- }
-
- @Override
- protected void updateStatus() {
- setIconDrawableToDisplay(mDisplayBrightnessDrawable);
- setIconContentDescription(mDisplayBrightnessContentDescription);
- onStatusUpdated();
- }
-}
diff --git a/src/com/android/systemui/car/statusicon/ui/QuickControlsEntryPointsModule.java b/src/com/android/systemui/car/statusicon/ui/QuickControlsEntryPointsModule.java
index 4b47234..1dcbc7c 100644
--- a/src/com/android/systemui/car/statusicon/ui/QuickControlsEntryPointsModule.java
+++ b/src/com/android/systemui/car/statusicon/ui/QuickControlsEntryPointsModule.java
@@ -44,13 +44,6 @@
public abstract CarSystemBarElementController.Factory bindSignalStatusIconController(
SignalStatusIconController.Factory signalStatusIconController);
- /** Injects DisplayStatusIconController. */
- @Binds
- @IntoMap
- @ClassKey(DisplayStatusIconController.class)
- public abstract CarSystemBarElementController.Factory bindDisplayStatusIconController(
- DisplayStatusIconController.Factory displayStatusIconController);
-
/** Injects LocationStatusIconController. */
@Binds
@IntoMap
diff --git a/src/com/android/systemui/car/wm/activity/ActivityBlockingActivity.java b/src/com/android/systemui/car/wm/activity/ActivityBlockingActivity.java
index 8505992..25a1682 100644
--- a/src/com/android/systemui/car/wm/activity/ActivityBlockingActivity.java
+++ b/src/com/android/systemui/car/wm/activity/ActivityBlockingActivity.java
@@ -15,6 +15,8 @@
*/
package com.android.systemui.car.wm.activity;
+import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
+
import static com.android.systemui.car.Flags.configAppBlockingActivities;
import android.app.ActivityManager;
@@ -28,6 +30,7 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.graphics.Insets;
import android.graphics.Rect;
import android.hardware.display.DisplayManager;
@@ -335,6 +338,17 @@
continue;
}
+ // TODO(b/359583186): Remove this check when targets with splitscreen multitasking
+ // feature are moved to DaViews.
+ if (getApplicationContext().getPackageManager().hasSystemFeature(
+ PackageManager.FEATURE_CAR_SPLITSCREEN_MULTITASKING)
+ && taskInfo.getWindowingMode() != WINDOWING_MODE_MULTI_WINDOW) {
+ // targets which have splitscreen multitasking feature, can have other visible
+ // tasks such as home which are not blocked. Only consider tasks with multi
+ // window windowing mode.
+ continue;
+ }
+
if (getComponentName().equals(taskInfo.topActivity)) {
// quit when stack with the blocking activity is encountered because the last seen
// task will be the topStackBehindAba.
diff --git a/tests/src/com/android/systemui/car/systembar/CarSystemBarButtonTest.java b/tests/src/com/android/systemui/car/systembar/CarSystemBarButtonTest.java
index d53ac25..ed3947f 100644
--- a/tests/src/com/android/systemui/car/systembar/CarSystemBarButtonTest.java
+++ b/tests/src/com/android/systemui/car/systembar/CarSystemBarButtonTest.java
@@ -21,6 +21,7 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assume.assumeFalse;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.argThat;
@@ -34,6 +35,7 @@
import android.app.ActivityManager;
import android.app.ActivityTaskManager;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.os.RemoteException;
import android.testing.AndroidTestingRunner;
@@ -252,6 +254,8 @@
@Test
public void onClick_launchesIntentActivity() {
+ assumeFalse(hasSplitscreenMultitaskingFeature());
+
mDefaultButton.performClick();
CarSystemBarButton dialerButton = mTestView.findViewById(R.id.dialer_activity);
@@ -263,6 +267,8 @@
@Test
public void onLongClick_longIntentDefined_launchesLongIntentActivity() {
+ assumeFalse(hasSplitscreenMultitaskingFeature());
+
mDefaultButton.performClick();
waitForIdleSync();
@@ -378,4 +384,12 @@
return null;
}
}
+
+ /**
+ * Checks whether the device has automotive split-screen multitasking feature enabled
+ */
+ private boolean hasSplitscreenMultitaskingFeature() {
+ return mContext.getPackageManager()
+ .hasSystemFeature(PackageManager.FEATURE_CAR_SPLITSCREEN_MULTITASKING);
+ }
}
diff --git a/tests/src/com/android/systemui/car/userpicker/UserPickerPassengerHeaderTest.java b/tests/src/com/android/systemui/car/userpicker/UserPickerPassengerHeaderTest.java
index 3b5f2a4..4de7f54 100644
--- a/tests/src/com/android/systemui/car/userpicker/UserPickerPassengerHeaderTest.java
+++ b/tests/src/com/android/systemui/car/userpicker/UserPickerPassengerHeaderTest.java
@@ -146,6 +146,8 @@
mHeaderstate.setState(HEADER_STATE_CHANGE_USER);
mActivityRule.getScenario().onActivity(activity -> {
activity.setupHeaderBar(mHeaderstate);
+ // clear any previous caches
+ clearInvocations(activity.mAdapter);
// initial settings
Configuration origConfiguration = activity.getResources().getConfiguration();
Configuration newConfiguration = origConfiguration;
