Update blocking screen.
- Use opaque background to put blocked activity into Stopped state
- Add blocked app name and icon
- Add debug info for non-user build
Test: verified with demo app
Bug: 111264725
Fix: 116732464
Fix: 118714747
Change-Id: I7325d429d7e36a32f69f6331d5e8eea9633f3688
(cherry picked from commit 0c689e7192da62c5293f3b4aa9f55394b86be281)
diff --git a/service/res/values/colors.xml b/service/res/values/colors.xml
index ed86a3b..6764116 100644
--- a/service/res/values/colors.xml
+++ b/service/res/values/colors.xml
@@ -18,18 +18,18 @@
-->
<resources>
<!-- Semi-transparent background color of blocking activity. -->
- <!-- In Call background scrim: grey 200 @ 90% -->
- <color name="activity_blocking_activity_background">#e6eeeeee</color>
+ <!-- In Call background scrim: grey 200 -->
+ <color name="activity_blocking_activity_background">#ffeeeeee</color>
<!-- Color of text in blocking activity. -->
<color name="blocking_text">#ff212121</color>
- <!-- Background color of exit button. -->
- <color name="exit_button_background">#ff00796b</color>
+ <!-- Background color of button. -->
+ <color name="button_background">#ff00796b</color>
- <!-- Color of exit button text. -->
- <color name="exit_button_text">#fffafafa</color>
+ <!-- Color of button text. -->
+ <color name="button_text">#fffafafa</color>
- <!-- Ripple color of exit button background. -->
+ <!-- Ripple color of button background. -->
<color name="ripple_background">#3d000000</color>
</resources>
diff --git a/service/res/values/dimens.xml b/service/res/values/dimens.xml
index f75a358..23653db 100644
--- a/service/res/values/dimens.xml
+++ b/service/res/values/dimens.xml
@@ -19,18 +19,14 @@
<resources>
<!-- Text size in ActivityBlockingActivity. -->
<dimen name="blocking_text_size">32sp</dimen>
- <!-- Padding of ActivityBlockingActivity. -->
- <dimen name="blocking_activity_padding">20dp</dimen>
-
- <!-- Minimum height of exit button in ActivityBlockingActivity. -->
- <dimen name="exit_button_min_height">56dp</dimen>
- <!-- Minimum width of exit button in ActivityBlockingActivity. -->
- <dimen name="exit_button_min_width">156dp</dimen>
- <!-- Padding of exit button in ActivityBlockingActivity. -->
- <dimen name="exit_button_padding">16dp</dimen>
- <!-- Radius of exit button in ActivityBlockingActivity. -->
- <dimen name="exit_button_radius">4dp</dimen>
- <!-- Top margin of exit button. It should be half the height of
- button (exit_button_min_height). -->
- <dimen name="exit_button_top_margin">28dp</dimen>
+ <!-- Widget margin. It should be half the height of button. -->
+ <dimen name="common_margin">28dp</dimen>
+ <!-- Minimum height of button in ActivityBlockingActivity. -->
+ <dimen name="button_min_height">56dp</dimen>
+ <!-- Minimum width of button in ActivityBlockingActivity. -->
+ <dimen name="button_min_width">156dp</dimen>
+ <!-- Padding of button in ActivityBlockingActivity. -->
+ <dimen name="button_padding">16dp</dimen>
+ <!-- Radius of button in ActivityBlockingActivity. -->
+ <dimen name="button_radius">4dp</dimen>
</resources>
diff --git a/service/res/values/strings.xml b/service/res/values/strings.xml
index 2de39f1..599e41f 100644
--- a/service/res/values/strings.xml
+++ b/service/res/values/strings.xml
@@ -103,10 +103,12 @@
<string name="car_can_bus_failure_desc">CAN bus does not respond. Unplug and plug back headunit
box and restart the car</string>
- <!-- Blocking activity: Message to show to user when an activity is not allowed during driving. [CHAR LIMIT=120] -->
- <string name="activity_blocked_string">For your safety, this activity isn’t available while you’re driving</string>
- <!-- Blocking activity: Button text that restarts the current blocked application. [CHAR LIMIT=10] -->
- <string name="exit_button">OK</string>
+ <!-- Blocking activity: Message to show to user when a feature of current application is not allowed. [CHAR LIMIT=120] -->
+ <string name="activity_blocked_text">For your safety, this activity isn’t available while you’re driving</string>
+ <!-- Blocking activity: Text for button that shows debug info for non-user build. [CHAR LIMIT=10] -->
+ <string name="debug_button_text">Debug Info</string>
+ <!-- Blocking activity: Text for button that restarts the current blocked application. [CHAR LIMIT=15] -->
+ <string name="exit_button">Restart App</string>
<!-- Permission text: apps can control diagnostic data [CHAR LIMIT=NONE] -->
<string name="car_permission_label_diag_read">Diagnostic Data</string>
diff --git a/service/res/values/styles.xml b/service/res/values/styles.xml
index 4098e96..35b0b29 100644
--- a/service/res/values/styles.xml
+++ b/service/res/values/styles.xml
@@ -17,21 +17,22 @@
<!-- TextAppearances for ActivityBlockingActivity. -->
<style name="ActivityBlockingActivityText">
<item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:textColor">@color/blocking_text</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">@dimen/blocking_text_size</item>
</style>
- <!-- Style of exit button. -->
- <style name="ExitButtonStyle">
- <item name="android:background">@drawable/exit_button_ripple_background</item>
+ <!-- Style for buttons in ActivityBlockingActivity. -->
+ <style name="ButtonStyle">
+ <item name="android:background">@drawable/button_ripple_background</item>
<item name="android:fontFamily">sans-serif-medium</item>
- <item name="android:minHeight">@dimen/exit_button_min_height</item>
- <item name="android:minWidth">@dimen/exit_button_min_width</item>
- <item name="android:paddingHorizontal">@dimen/exit_button_padding</item>
+ <item name="android:minHeight">@dimen/button_min_height</item>
+ <item name="android:minWidth">@dimen/button_min_width</item>
+ <item name="android:paddingHorizontal">@dimen/button_padding</item>
<item name="android:textAllCaps">true</item>
<item name="android:textAlignment">center</item>
<item name="android:textAppearance">@style/ActivityBlockingActivityText</item>
- <item name="android:textColor">@color/exit_button_text</item>
+ <item name="android:textColor">@color/button_text</item>
</style>
</resources>