Merge "Import translations. DO NOT MERGE"
diff --git a/service/src/com/android/car/audio/CarAudioFocus.java b/service/src/com/android/car/audio/CarAudioFocus.java
index c4aff05..97f284b 100644
--- a/service/src/com/android/car/audio/CarAudioFocus.java
+++ b/service/src/com/android/car/audio/CarAudioFocus.java
@@ -341,7 +341,7 @@
/**
* @see AudioManager#abandonAudioFocus(AudioManager.OnAudioFocusChangeListener, AudioAttributes)
- * Note that we'll get this call for a focus holder that dies while in the focus statck, so
+ * Note that we'll get this call for a focus holder that dies while in the focus stack, so
* we don't need to watch for death notifications directly.
* */
@Override
@@ -364,6 +364,7 @@
// silently, or else take unexpected action (eg: resume playing spontaneously), or
// else to see "Failure to signal ..." gain/loss error messages in the log from
// this module when a focus change tries to take action on a truly zombie entry.
+ return;
}
}
diff --git a/service/src/com/android/car/pm/ActivityBlockingActivity.java b/service/src/com/android/car/pm/ActivityBlockingActivity.java
index fd792a6..aabdb72 100644
--- a/service/src/com/android/car/pm/ActivityBlockingActivity.java
+++ b/service/src/com/android/car/pm/ActivityBlockingActivity.java
@@ -197,6 +197,14 @@
}
@Override
+ protected void onStop() {
+ super.onStop();
+ // Finish when blocking activity goes invisible to avoid it accidentally re-surfaces with
+ // stale string regarding blocked activity.
+ finish();
+ }
+
+ @Override
protected void onDestroy() {
super.onDestroy();
if (mCar.isConnected() && mUxRManager != null) {
diff --git a/tests/EmbeddedKitchenSinkApp/res/layout/users.xml b/tests/EmbeddedKitchenSinkApp/res/layout/users.xml
index 5a862bf..e144acd 100644
--- a/tests/EmbeddedKitchenSinkApp/res/layout/users.xml
+++ b/tests/EmbeddedKitchenSinkApp/res/layout/users.xml
@@ -19,8 +19,9 @@
android:orientation="vertical" >
<ListView
android:id="@+id/user_restrictions_list"
- android:layout_height="wrap_content"
+ android:layout_height="0dp"
android:layout_width="match_parent"
+ android:layout_weight="1"
android:scrollbars="vertical"/>
<Button
@@ -29,5 +30,6 @@
android:layout_height="wrap_content"
android:padding="@dimen/users_button_padding"
android:textSize="@dimen/users_button_text_size"
+ android:layout_weight="0"
android:text="@string/users_apply_button" />
</LinearLayout>