| commit | 2d05940d34b8f2fc9b8e766515b07e364295bc47 | [log] [tgz] |
|---|---|---|
| author | Alex Clarke <[email protected]> | Fri Feb 04 09:56:37 2022 +0000 |
| committer | Alex Clarke <[email protected]> | Fri Feb 04 11:07:07 2022 +0000 |
| tree | 560005df81ed8eaf87a7162b80b29ba4e8dd9c67 | |
| parent | f2799fff1e42033a3cc55fe61beddee56aeedf25 [diff] |
Migrate androidx.wear.watchface.data's R class to the expected package Test: N/A Bug: 208850398 Change-Id: If5dc2593f729a525b6b1c506523847046373749b
diff --git a/wear/watchface/watchface-data/src/main/AndroidManifest.xml b/wear/watchface/watchface-data/src/main/AndroidManifest.xml index 2be667d..d3ca6a5 100644 --- a/wear/watchface/watchface-data/src/main/AndroidManifest.xml +++ b/wear/watchface/watchface-data/src/main/AndroidManifest.xml
@@ -16,5 +16,5 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="android.support.wearable.watchface"> + package="androidx.wear.watchface.data"> </manifest>
diff --git a/wear/watchface/watchface-data/src/main/java/android/support/wearable/watchface/accessibility/AccessibilityUtils.java b/wear/watchface/watchface-data/src/main/java/android/support/wearable/watchface/accessibility/AccessibilityUtils.java index ab96188..054835b 100644 --- a/wear/watchface/watchface-data/src/main/java/android/support/wearable/watchface/accessibility/AccessibilityUtils.java +++ b/wear/watchface/watchface-data/src/main/java/android/support/wearable/watchface/accessibility/AccessibilityUtils.java
@@ -21,11 +21,11 @@ import android.support.wearable.complications.ComplicationText; import android.support.wearable.complications.ComplicationTextTemplate; import android.support.wearable.complications.TimeDependentText; -import android.support.wearable.watchface.R; import android.text.format.DateFormat; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; +import androidx.wear.watchface.data.R; /** * Utilities for making watch faces and complications accessible.