Merge "AndroidX: Separate widget class from Media module" into pi-preview1-androidx-dev
diff --git a/car/res/values/integers.xml b/car/res/values/integers.xml
index 1acb572..dcae680 100644
--- a/car/res/values/integers.xml
+++ b/car/res/values/integers.xml
@@ -31,10 +31,6 @@
<!-- Slide Down Menu -->
<integer name="car_slide_down_menu_column_number">4</integer>
- <!-- The length limit of body text in a paged list item. String longer than this limit should be
- truncated. -->
- <integer name="car_list_item_text_length_limit">120</integer>
-
<!-- The length limit of text in a borderless button. String longer than this limit should be
truncated. -->
<integer name="car_borderless_button_text_length_limit">20</integer>
diff --git a/car/src/main/java/androidx/car/utils/CarUxRestrictionsUtils.java b/car/src/main/java/androidx/car/utils/CarUxRestrictionsUtils.java
index e06ba80..7fec3c0 100644
--- a/car/src/main/java/androidx/car/utils/CarUxRestrictionsUtils.java
+++ b/car/src/main/java/androidx/car/utils/CarUxRestrictionsUtils.java
@@ -20,7 +20,6 @@
import android.car.drivingstate.CarUxRestrictions;
import android.content.Context;
-import androidx.annotation.RestrictTo;
import android.text.InputFilter;
import android.widget.TextView;
@@ -28,7 +27,7 @@
import java.util.Arrays;
import java.util.List;
-import androidx.car.R;
+import androidx.annotation.RestrictTo;
/**
* Utility class that helps {@code View}s comply with {@link CarUxRestrictions}.
@@ -53,8 +52,7 @@
*/
public static void comply(Context context, CarUxRestrictions carUxRestrictions, TextView tv) {
if (sStringLengthFilter == null) {
- int lengthLimit = context.getResources().getInteger(
- R.integer.car_list_item_text_length_limit);
+ int lengthLimit = carUxRestrictions.getMaxRestrictedStringLength();
sStringLengthFilter = new InputFilter.LengthFilter(lengthLimit);
}
diff --git a/media/src/main/java/androidx/media/MediaBrowserServiceCompat.java b/media/src/main/java/androidx/media/MediaBrowserServiceCompat.java
index 430913e..8f24837 100644
--- a/media/src/main/java/androidx/media/MediaBrowserServiceCompat.java
+++ b/media/src/main/java/androidx/media/MediaBrowserServiceCompat.java
@@ -1020,8 +1020,11 @@
* Note that we cannot simply override {@link Service#attachBaseContext(Context)} and hide it
* because lint checks considers the overriden method as the new public API that needs update
* of current.txt.
+ *
+ * @hide
*/
- void attachToBaseContext(Context base) {
+ @RestrictTo(LIBRARY)
+ public void attachToBaseContext(Context base) {
attachBaseContext(base);
}