From ab6fd7362d48745785e89d10979d8d1f43616220 Mon Sep 17 00:00:00 2001
From: Danny Epstein <depstein@google.com>
Date: Mon, 14 Dec 2020 18:14:59 -0800
Subject: DO NOT MERGE Focus clock by default

When nudging up to the status bar, focus the clock by default.

Test: Nudge up to status bar, switch from Launcher to Home
Bug: 169250454
Change-Id: Id55c236a447b86d502d46e799814b51c984916e4
---
 packages/CarSystemUI/res/layout/car_top_navigation_bar.xml            | 4 ++--
 .../CarSystemUI/res/layout/car_top_navigation_bar_unprovisioned.xml   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml b/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml
index cdc29eec21cd..cb1aadaf7fe7 100644
--- a/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml
+++ b/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml
@@ -77,8 +77,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@null"
-                systemui:intent="intent:#Intent;component=com.android.car.settings/.common.CarSettingActivities$QuickSettingActivity;launchFlags=0x24000000;end"
-            />
+                android:focusedByDefault="true"
+                systemui:intent="intent:#Intent;component=com.android.car.settings/.common.CarSettingActivities$QuickSettingActivity;launchFlags=0x24000000;end"/>
             <com.android.systemui.statusbar.policy.Clock
                 android:id="@+id/clock"
                 android:layout_width="wrap_content"
diff --git a/packages/CarSystemUI/res/layout/car_top_navigation_bar_unprovisioned.xml b/packages/CarSystemUI/res/layout/car_top_navigation_bar_unprovisioned.xml
index 9634950e4748..cfa02a2023a1 100644
--- a/packages/CarSystemUI/res/layout/car_top_navigation_bar_unprovisioned.xml
+++ b/packages/CarSystemUI/res/layout/car_top_navigation_bar_unprovisioned.xml
@@ -74,7 +74,8 @@
           android:id="@+id/qs"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
-          android:background="@null"/>
+          android:background="@null"
+          android:focusedByDefault="true"/>
       <com.android.systemui.statusbar.policy.Clock
           android:id="@+id/clock"
           android:layout_width="wrap_content"
-- 
cgit v1.2.3-59-g8ed1b