commit fcc6b6ce7c4c24b927c38b144fe878b52687fa6a
author Jaewan Kim <jaewan@google.com> Wed Oct 16 23:23:29 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 16 23:23:29 2024 +0000
tree ff9321d60e0af7c140f5da0c4b46e0812841b607
parent 71c59bae9cc7fb2fbd51a850d5026ba265633c15
parent 591d4fd93296cc86f5b3380ede6c5c3095cfb81c

Merge "Enable Linux terminal app via developer settings" into main

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0bd0406..deebb7f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -455,11 +455,13 @@
     </style>
 
     <style name="SearchBarStyle">
+        <item name="android:theme">@style/Theme.MaterialComponents.DayNight</item>
         <item name="cardCornerRadius">@dimen/search_bar_corner_radius</item>
         <item name="cardElevation">0dp</item>
     </style>
 
     <style name="SearchBarStyle_v2">
+        <item name="android:theme">@style/Theme.MaterialComponents.DayNight</item>
         <item name="cardCornerRadius">40dp</item>
         <item name="cardElevation">0dp</item>
         <item name="strokeWidth">1dp</item>

tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java

diff --git a/tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java b/tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java
index 953a524..8764d4f 100644
--- a/tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java
+++ b/tests/unit/src/com/android/settings/vpn2/VpnSettingsTest.java
@@ -130,6 +130,7 @@
     }
 
     @Test
+    @UiThreadTest
     public void setShownAdvancedPreferences_hasGeneralVpn_returnsVpnCountAs1() {
         Set<Preference> updates = new ArraySet<>();
         AppPreference pref =
@@ -144,6 +145,7 @@
     }
 
     @Test
+    @UiThreadTest
     public void setShownAdvancedPreferences_hasAdvancedVpn_returnsAdvancedVpnCountAs1() {
         Set<Preference> updates = new ArraySet<>();
         AppPreference pref =
@@ -158,6 +160,7 @@
     }
 
     @Test
+    @UiThreadTest
     public void setShownAdvancedPreferences_noVpn_returnsEmpty() {
         Set<Preference> updates = new ArraySet<>();
 
@@ -198,6 +201,7 @@
     }
 
     @Test
+    @UiThreadTest
     public void clickVpn_VpnConnected_doesNotStartVpnLaunchIntent()
             throws PackageManager.NameNotFoundException {
         Set<Preference> updates = new ArraySet<>();
@@ -217,6 +221,7 @@
     }
 
     @Test
+    @UiThreadTest
     public void clickVpn_VpnDisconnected_startsVpnLaunchIntent()
             throws PackageManager.NameNotFoundException {
         Set<Preference> updates = new ArraySet<>();
@@ -238,6 +243,7 @@
     }
 
     @Test
+    @UiThreadTest
     public void clickAdvancedVpn_VpnConnectedDisconnectDialogDisabled_startsAppLaunchIntent()
             throws PackageManager.NameNotFoundException {
         Set<Preference> updates = new ArraySet<>();
@@ -262,6 +268,7 @@
     }
 
     @Test
+    @UiThreadTest
     public void clickAdvancedVpn_VpnConnectedDisconnectDialogEnabled_doesNotStartAppLaunchIntent()
             throws PackageManager.NameNotFoundException {
         Set<Preference> updates = new ArraySet<>();