diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/drawable/chooser_action_button_bg.xml | 2 | ||||
| -rw-r--r-- | java/res/drawable/chooser_row_layer_list.xml | 2 | ||||
| -rw-r--r-- | java/res/drawable/resolver_outlined_button_bg.xml | 2 | ||||
| -rw-r--r-- | java/res/drawable/resolver_profile_tab_bg.xml | 2 | ||||
| -rw-r--r-- | java/res/layout/chooser_grid.xml | 2 | ||||
| -rw-r--r-- | java/src/com/android/intentresolver/ChooserContentPreviewUi.java | 1 | ||||
| -rw-r--r-- | java/src/com/android/intentresolver/flags/Flags.kt | 20 | ||||
| -rw-r--r-- | java/tests/Android.bp | 1 | ||||
| -rw-r--r-- | java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java | 4 |
9 files changed, 18 insertions, 18 deletions
diff --git a/java/res/drawable/chooser_action_button_bg.xml b/java/res/drawable/chooser_action_button_bg.xml index b984a067..b03c310e 100644 --- a/java/res/drawable/chooser_action_button_bg.xml +++ b/java/res/drawable/chooser_action_button_bg.xml @@ -26,7 +26,7 @@ <shape android:shape="rectangle"> <corners android:radius="8dp" /> <stroke android:width="1dp" - android:color="?androidprv:attr/colorAccentPrimaryVariant"/> + android:color="?androidprv:attr/materialColorPrimaryContainer"/> </shape> </inset> </item> diff --git a/java/res/drawable/chooser_row_layer_list.xml b/java/res/drawable/chooser_row_layer_list.xml index 43f0cf6f..868ac8aa 100644 --- a/java/res/drawable/chooser_row_layer_list.xml +++ b/java/res/drawable/chooser_row_layer_list.xml @@ -20,7 +20,7 @@ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"> <item> <shape android:shape="rectangle"> - <solid android:color="?androidprv:attr/colorAccentSecondary"/> + <solid android:color="?androidprv:attr/materialColorSecondary"/> <size android:width="128dp" android:height="2dp"/> <corners android:radius="2dp" /> </shape> diff --git a/java/res/drawable/resolver_outlined_button_bg.xml b/java/res/drawable/resolver_outlined_button_bg.xml index da569e72..3469a06e 100644 --- a/java/res/drawable/resolver_outlined_button_bg.xml +++ b/java/res/drawable/resolver_outlined_button_bg.xml @@ -26,7 +26,7 @@ <shape android:shape="rectangle"> <corners android:radius="8dp" /> <stroke android:width="1dp" - android:color="?androidprv:attr/colorAccentPrimaryVariant"/> + android:color="?androidprv:attr/materialColorPrimaryContainer"/> </shape> </inset> </item> diff --git a/java/res/drawable/resolver_profile_tab_bg.xml b/java/res/drawable/resolver_profile_tab_bg.xml index 66cd6d88..c7f2dd35 100644 --- a/java/res/drawable/resolver_profile_tab_bg.xml +++ b/java/res/drawable/resolver_profile_tab_bg.xml @@ -29,7 +29,7 @@ <item android:state_selected="false"> <shape android:shape="rectangle"> <corners android:radius="12dp" /> - <solid android:color="?androidprv:attr/colorSurface" /> + <solid android:color="?androidprv:attr/materialColorSurfaceContainer" /> </shape> </item> diff --git a/java/res/layout/chooser_grid.xml b/java/res/layout/chooser_grid.xml index d863495d..dc9954d5 100644 --- a/java/res/layout/chooser_grid.xml +++ b/java/res/layout/chooser_grid.xml @@ -43,7 +43,7 @@ android:src="@drawable/ic_drag_handle" android:layout_marginTop="@dimen/chooser_edge_margin_thin" android:layout_marginBottom="@dimen/chooser_edge_margin_thin" - android:tint="?androidprv:attr/colorSurfaceVariant" + android:tint="?androidprv:attr/materialColorSurfaceContainerHigh" android:layout_centerHorizontal="true" android:layout_alignParentTop="true" /> diff --git a/java/src/com/android/intentresolver/ChooserContentPreviewUi.java b/java/src/com/android/intentresolver/ChooserContentPreviewUi.java index aa147853..61affdf3 100644 --- a/java/src/com/android/intentresolver/ChooserContentPreviewUi.java +++ b/java/src/com/android/intentresolver/ChooserContentPreviewUi.java @@ -17,6 +17,7 @@ package com.android.intentresolver; import static android.content.ContentProvider.getUserIdFromUri; + import static java.lang.annotation.RetentionPolicy.SOURCE; import android.animation.ObjectAnimator; diff --git a/java/src/com/android/intentresolver/flags/Flags.kt b/java/src/com/android/intentresolver/flags/Flags.kt index f4dbeddb..40f32bf3 100644 --- a/java/src/com/android/intentresolver/flags/Flags.kt +++ b/java/src/com/android/intentresolver/flags/Flags.kt @@ -16,6 +16,7 @@ package com.android.intentresolver.flags +import com.android.systemui.flags.ReleasedFlag import com.android.systemui.flags.UnreleasedFlag // Flag id, name and namespace should be kept in sync with [com.android.systemui.flags.Flags] to @@ -28,28 +29,27 @@ object Flags { // TODO(b/266983432) Tracking Bug @JvmField - val SHARESHEET_CUSTOM_ACTIONS = unreleasedFlag( - 1501, SHARESHEET_CUSTOM_ACTIONS_NAME, teamfood = true - ) + val SHARESHEET_CUSTOM_ACTIONS = releasedFlag(1501, SHARESHEET_CUSTOM_ACTIONS_NAME) // TODO(b/266982749) Tracking Bug @JvmField - val SHARESHEET_RESELECTION_ACTION = unreleasedFlag( - 1502, SHARESHEET_RESELECTION_ACTION_NAME, teamfood = true - ) + val SHARESHEET_RESELECTION_ACTION = releasedFlag(1502, SHARESHEET_RESELECTION_ACTION_NAME) // TODO(b/266983474) Tracking Bug @JvmField - val SHARESHEET_IMAGE_AND_TEXT_PREVIEW = unreleasedFlag( - id = 1503, name = SHARESHEET_IMAGE_AND_TEXT_PREVIEW_NAME, teamfood = true + val SHARESHEET_IMAGE_AND_TEXT_PREVIEW = releasedFlag( + id = 1503, name = SHARESHEET_IMAGE_AND_TEXT_PREVIEW_NAME ) // TODO(b/267355521) Tracking Bug @JvmField - val SHARESHEET_SCROLLABLE_IMAGE_PREVIEW = unreleasedFlag( - 1504, SHARESHEET_SCROLLABLE_IMAGE_PREVIEW_NAME, teamfood = true + val SHARESHEET_SCROLLABLE_IMAGE_PREVIEW = releasedFlag( + 1504, SHARESHEET_SCROLLABLE_IMAGE_PREVIEW_NAME ) + private fun releasedFlag(id: Int, name: String) = + ReleasedFlag(id, name, "systemui") + private fun unreleasedFlag(id: Int, name: String, teamfood: Boolean = false) = UnreleasedFlag(id, name, "systemui", teamfood) } diff --git a/java/tests/Android.bp b/java/tests/Android.bp index 4e835ec8..12cb390e 100644 --- a/java/tests/Android.bp +++ b/java/tests/Android.bp @@ -34,7 +34,6 @@ android_test { ], test_suites: ["general-tests"], sdk_version: "core_platform", - platform_apis: true, compile_multilib: "both", dont_merge_manifests: true, diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java index 9ffd02d4..0aab0536 100644 --- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java +++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java @@ -179,9 +179,9 @@ public class UnbundledChooserActivityTest { public static Collection packageManagers() { return Arrays.asList(new Object[][] { // Default PackageManager and all flags off - { DEFAULT_PM, ALL_FLAGS_OFF }, + { DEFAULT_PM, ALL_FLAGS_OFF}, // Default PackageManager and all flags on - { DEFAULT_PM, ALL_FLAGS_ON }, + { DEFAULT_PM, ALL_FLAGS_ON}, // No App Prediction Service and all flags off { NO_APP_PREDICTION_SERVICE_PM, ALL_FLAGS_OFF }, // No App Prediction Service and all flags on |