commit cb29dc64a72a6317aacd4708606779b8a22e7e33
author Rajeev Kumar <rajekumar@google.com> Sun May 21 17:33:32 2023 -0700
committer Rajeev Kumar <rajekumar@google.com> Sun May 21 17:33:32 2023 -0700
tree 5915a161216e41d1fc42144ba8852b0b533a9576
parent 9ce7f5e5a50e46c863f461e401e3a07d6ae38786

Add Theme.DeviceLock.NoActionBar theme to the DeviceLock activities.

Bug: 282798149
Test: Manual testing using go/devicelock-debug-apex
Change-Id: I9539941417802919a621353893522c54d6ae351d

DeviceLockController/AndroidManifestBase.xml

diff --git a/DeviceLockController/AndroidManifestBase.xml b/DeviceLockController/AndroidManifestBase.xml
index 857cc83..6a6c10f 100644
--- a/DeviceLockController/AndroidManifestBase.xml
+++ b/DeviceLockController/AndroidManifestBase.xml
@@ -51,11 +51,11 @@
         <activity
             android:name="com.android.devicelockcontroller.activities.HelpActivity"
             android:exported="false"
-            android:theme="@style/Theme.Materialu" />
+            android:theme="@style/Theme.DeviceLock.NoActionBar" />
         <activity
             android:name="com.android.devicelockcontroller.activities.LandingActivity"
             android:exported="false"
-            android:theme="@style/Theme.Materialu">
+            android:theme="@style/Theme.DeviceLock.NoActionBar">
             <intent-filter>
                 <action android:name="com.android.devicelockcontroller.action.START_DEVICE_FINANCING_PROVISIONING" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -65,7 +65,7 @@
         <activity
             android:name="com.android.devicelockcontroller.activities.ProvisioningActivity"
             android:exported="false"
-            android:theme="@style/Theme.Materialu" />
+            android:theme="@style/Theme.DeviceLock.NoActionBar" />
 
         <activity-alias
             android:name="com.android.devicelockcontroller.activities.DeviceFinancingSecondaryUserLandingActivity"
@@ -127,7 +127,7 @@
 
         <activity
             android:name="com.android.devicelockcontroller.activities.DeviceEnrollmentActivity"
-            android:theme="@style/Theme.Materialu"
+            android:theme="@style/Theme.DeviceLock.NoActionBar"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.android.devicelockcontroller.action.START_DEVICE_FINANCING_ENROLLMENT"/>
@@ -146,7 +146,7 @@
 
         <activity
             android:name="com.android.devicelockcontroller.activities.DeviceLockSettingsActivity"
-            android:theme="@style/Theme.Materialu"
+            android:theme="@style/Theme.DeviceLock.NoActionBar"
             android:exported="true">
             <intent-filter>
                 <action android:name="com.android.devicelockcontroller.action.DEVICE_INFO_SETTINGS"/>

DeviceLockController/res/values/styles.xml

diff --git a/DeviceLockController/res/values/styles.xml b/DeviceLockController/res/values/styles.xml
index 5b780a4..b93c654 100644
--- a/DeviceLockController/res/values/styles.xml
+++ b/DeviceLockController/res/values/styles.xml
@@ -17,5 +17,8 @@
 
 <resources>
     <style name="Base.Theme.Materialu" parent="Theme.Material3.DynamicColors.DayNight"/>
-    <style name="Theme.Materialu" parent="Base.Theme.Materialu" />
+    <style name="Theme.DeviceLock.NoActionBar" parent="Base.Theme.Materialu">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
 </resources>