commit f89767f29b739eb8a82d6cab46bae7de15b47a89
author Bill Yi <byi@google.com> Wed Mar 30 20:43:14 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 30 20:43:14 2016 +0000
tree ae6b32ff0c0d68937ebf5f4e87c05105c4d7efa8
parent 7ee3df3c714b614ab28cef094a28543fb5e01465
parent 62d4f5bbd5d33852775f5c0cc8c64177c3551f91

Merge "Import translations. DO NOT MERGE" into nyc-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 14a8162..7885f18 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -46,6 +46,10 @@
                 <action android:name="android.settings.EDIT_EMERGENGY_INFO" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.emergency.EDIT_EMERGENCY_CONTACTS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
     </application>
 

src/com/android/emergency/EmergencyTabActivity.java

diff --git a/src/com/android/emergency/EmergencyTabActivity.java b/src/com/android/emergency/EmergencyTabActivity.java
index bc13d6c..322949a 100644
--- a/src/com/android/emergency/EmergencyTabActivity.java
+++ b/src/com/android/emergency/EmergencyTabActivity.java
@@ -78,6 +78,14 @@
         getActionBar().setDisplayHomeAsUpEnabled(true);
     }
 
+    /** Selects the tab at index {@code selectedTabIndex}. */
+    public void selectTab(int selectedTabIndex) {
+        if (mTabLayout != null && selectedTabIndex >= 0 &&
+                selectedTabIndex < mTabLayout.getTabCount()) {
+            mTabLayout.getTabAt(selectedTabIndex).select();
+        }
+    }
+
     protected void setupTabs() {
         mFragments = setUpFragments();
         mTabLayout = (TabLayout) findViewById(R.id.sliding_tabs);

src/com/android/emergency/edit/EditInfoActivity.java

diff --git a/src/com/android/emergency/edit/EditInfoActivity.java b/src/com/android/emergency/edit/EditInfoActivity.java
index be6021f..e26a56d 100644
--- a/src/com/android/emergency/edit/EditInfoActivity.java
+++ b/src/com/android/emergency/edit/EditInfoActivity.java
@@ -45,6 +45,8 @@
     private static final String TAG_WARNING_DIALOG = "warning_dialog";
     private static final String KEY_LAST_CONSENT_TIME_MS = "last_consent_time_ms";
     private static final long ONE_DAY_MS = 24 * 60 * 60 * 1000;
+    private static final String ACTION_EDIT_EMERGENCY_CONTACTS =
+            "android.emergency.EDIT_EMERGENCY_CONTACTS";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -66,6 +68,11 @@
             }
         }
 
+        if (ACTION_EDIT_EMERGENCY_CONTACTS.equals(getIntent().getAction())) {
+            // Select emergency contacts tab
+            selectTab(1);
+        }
+
         getWindow().addFlags(FLAG_DISMISS_KEYGUARD);
         MetricsLogger.visible(this, MetricsEvent.ACTION_EDIT_EMERGENCY_INFO);
     }