Fix EmergencyInfo for use_resource_processor: true

Use a separate package name in the AndroidManifest.xml for each
android_library.  Reference resources using the package name of the
library that includes them.

Bug: 294256649
Test: m javac-check
Change-Id: Ic1e4030a54dfc6e9fadf77317ab237852abe5e9b

12 files changed, 13 insertions, 14 deletions

diff --git a/EmergencyGestureAction/AndroidManifest.xml b/EmergencyGestureAction/AndroidManifest.xml
index 87b8a289..33219e90 100644
--- a/EmergencyGestureAction/AndroidManifest.xml
+++ b/EmergencyGestureAction/AndroidManifest.xml
@@ -18,7 +18,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.android.emergency">
+    package="com.android.emergency.action">
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
diff --git a/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionActivity.java b/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionActivity.java
index 34a31b10..fee76695 100644
--- a/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionActivity.java
+++ b/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionActivity.java
@@ -28,7 +28,7 @@ import android.view.WindowInsets;
 import android.view.WindowInsetsController;
 
 import com.android.emergency.action.EmergencyActionUtils;
-import com.android.emergency.R;
+import com.android.emergency.action.R;
 
 /**
  * Activity for handling emergency action.
diff --git a/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionFragment.java b/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionFragment.java
index c191ab26..02415dfd 100644
--- a/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionFragment.java
+++ b/EmergencyGestureAction/src/com/android/emergency/action/EmergencyActionFragment.java
@@ -33,7 +33,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.emergency.R;
 import com.android.emergency.action.broadcast.EmergencyActionBroadcastReceiver;
 import com.android.emergency.action.sensoryfeedback.EmergencyActionAlarmHelper;
 import com.android.emergency.action.service.EmergencyActionForegroundService;
diff --git a/EmergencyGestureAction/src/com/android/emergency/action/sensoryfeedback/EmergencyActionAlarmHelper.java b/EmergencyGestureAction/src/com/android/emergency/action/sensoryfeedback/EmergencyActionAlarmHelper.java
index 64043262..9d877e09 100644
--- a/EmergencyGestureAction/src/com/android/emergency/action/sensoryfeedback/EmergencyActionAlarmHelper.java
+++ b/EmergencyGestureAction/src/com/android/emergency/action/sensoryfeedback/EmergencyActionAlarmHelper.java
@@ -24,7 +24,7 @@ import android.provider.Settings;
 import android.util.Log;
 
 import com.android.emergency.action.EmergencyActionUtils;
-import com.android.emergency.R;
+import com.android.emergency.action.R;
 
 
 public class EmergencyActionAlarmHelper {
diff --git a/EmergencyGestureAction/src/com/android/emergency/action/service/EmergencyActionForegroundService.java b/EmergencyGestureAction/src/com/android/emergency/action/service/EmergencyActionForegroundService.java
index 274d324d..4394428b 100644
--- a/EmergencyGestureAction/src/com/android/emergency/action/service/EmergencyActionForegroundService.java
+++ b/EmergencyGestureAction/src/com/android/emergency/action/service/EmergencyActionForegroundService.java
@@ -35,7 +35,7 @@ import android.telecom.TelecomManager;
 import android.util.Log;
 import android.widget.RemoteViews;
 
-import com.android.emergency.R;
+import com.android.emergency.action.R;
 import com.android.emergency.action.broadcast.EmergencyActionBroadcastReceiver;
 import com.android.emergency.action.sensoryfeedback.EmergencyActionAlarmHelper;
 import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
diff --git a/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownAnimationView.java b/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownAnimationView.java
index ae16437b..c437570d 100644
--- a/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownAnimationView.java
+++ b/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownAnimationView.java
@@ -25,7 +25,7 @@ import android.view.SurfaceView;
 
 import androidx.annotation.UiThread;
 
-import com.android.emergency.R;
+import com.android.emergency.action.R;
 
 import com.google.common.util.concurrent.Uninterruptibles;
 
diff --git a/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownRenderer.java b/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownRenderer.java
index a474255e..6bb301bf 100644
--- a/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownRenderer.java
+++ b/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/CountDownRenderer.java
@@ -26,7 +26,7 @@ import android.graphics.Typeface;
 
 import androidx.annotation.GuardedBy;
 
-import com.android.emergency.R;
+import com.android.emergency.action.R;
 
 import java.time.Duration;
 
diff --git a/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/LoopingAnimationThread.java b/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/LoopingAnimationThread.java
index 33ebed7e..47cc8e55 100644
--- a/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/LoopingAnimationThread.java
+++ b/EmergencyGestureAction/src/com/android/emergency/widgets/countdown/LoopingAnimationThread.java
@@ -29,7 +29,7 @@ import android.view.animation.DecelerateInterpolator;
 
 import androidx.annotation.GuardedBy;
 
-import com.android.emergency.R;
+import com.android.emergency.action.R;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -236,4 +236,4 @@ final class LoopingAnimationThread extends Thread {
     void stopDrawing() {
         mIsDrawing = false;
     }
-}
\ No newline at end of file
+}
diff --git a/EmergencyGestureAction/src/com/android/emergency/widgets/slider/SliderView.java b/EmergencyGestureAction/src/com/android/emergency/widgets/slider/SliderView.java
index 03310ae5..e154459c 100644
--- a/EmergencyGestureAction/src/com/android/emergency/widgets/slider/SliderView.java
+++ b/EmergencyGestureAction/src/com/android/emergency/widgets/slider/SliderView.java
@@ -24,7 +24,7 @@ import android.widget.FrameLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.android.emergency.R;
+import com.android.emergency.action.R;
 
 /**
  * A slider button. User can slide the thumb/scrim from one end to the other end to activate the
@@ -105,4 +105,4 @@ public final class SliderView extends FrameLayout
     @Override
     public void onStopTrackingTouch(SeekBar seekBar) {
     }
-}
\ No newline at end of file
+}
diff --git a/EmergencyGestureContentProvider/AndroidManifest.xml b/EmergencyGestureContentProvider/AndroidManifest.xml
index 8437c519..d17e8476 100644
--- a/EmergencyGestureContentProvider/AndroidManifest.xml
+++ b/EmergencyGestureContentProvider/AndroidManifest.xml
@@ -16,6 +16,6 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.emergency">
+          package="com.android.emergency.contentprovider">
 
 </manifest>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 56dbc509..51817200 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -17,7 +17,7 @@
     <declare-styleable name="EmergencyEditTextPreference">
         <!-- Summary text for the text preference. This is used rather than android:summary to
         avoid indexing the text incorrectly during settings search. -->
-        <attr name="summary" />
+        <attr name="summary" format="string" />
     </declare-styleable>
 
     <declare-styleable name="EmergencyListPreference">
diff --git a/src/com/android/emergency/preferences/EmergencyNamePreference.java b/src/com/android/emergency/preferences/EmergencyNamePreference.java
index b6a754f0..a2bc1247 100644
--- a/src/com/android/emergency/preferences/EmergencyNamePreference.java
+++ b/src/com/android/emergency/preferences/EmergencyNamePreference.java
@@ -69,7 +69,7 @@ public class EmergencyNamePreference extends CustomDialogPreference {
     }
 
     public EmergencyNamePreference(Context context, AttributeSet attrs) {
-        this(context, attrs, R.attr.dialogPreferenceStyle);
+        this(context, attrs, androidx.preference.R.attr.dialogPreferenceStyle);
     }
 
     public EmergencyNamePreference(Context context) {