commit d6bbac5f7c1dca2e9b961863c079296dbf5f08a6
author Juan Lang <juanlang@google.com> Thu Jul 20 17:56:11 2017 -0700
committer Juan Lang <juanlang@google.com> Fri Jul 21 15:26:01 2017 -0700
tree 9cd8ce8562a511a8138a23edd7a14d1eb7ea154e
parent ce2c089ef9376a00b680d140c0ee3e12e47806f6

Hide settings suggestion when emergency info are provided.

Introduce an activity alias for the edit activity. Set the settings
suggestion on the alias rather than the edit activity. Enable / disable
the alias activity when emergency info are removed / set, respectively.

Change-Id: I0dadf3c9a3d7b5020fd4b43e82444b82cc39108a
Fix: 63533900
Test: manual && make RunEmergencyInfoRoboTests && \
    runtest --path packages/apps/EmergencyInfo/tests/

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 80433c5..44d542d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -50,6 +50,14 @@
                 <action android:name="android.settings.EDIT_EMERGENCY_INFO" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+        </activity>
+
+        <!-- Alias for edit activity, to allow settings suggestion to be independent from main activity -->
+        <activity-alias
+            android:name=".edit.EditInfoSuggestion"
+            android:label="@string/app_label"
+            android:targetActivity=".edit.EditInfoActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
@@ -61,7 +69,7 @@
                        android:resource="@string/settings_suggestion_body" />
             <meta-data android:name="com.android.settings.icon"
                        android:resource="@drawable/ic_local_hospital_24dp" />
-        </activity>
+        </activity-alias>
 
         <activity
             android:name=".edit.EditMedicalInfoActivity"