commit 219d224fe572ed73eabf590c9bdec3f9a8dbcc3b
author Marcus Hagerott <mhagerott@google.com> Sat Nov 12 02:41:39 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Nov 12 02:41:40 2016 +0000
tree 6d68a6f325e1e6cb0f6f6fe4ead5e8e1000b9544
parent 629284b4dbfbb320c53b09c9a1242d458b79e02c
parent cf5d261053c7257770ec38385521042e6cccf0cd

Merge "Fix occasional hang when loading from SIM" into ub-contactsdialer-h-dev

AndroidManifest_common.xml

diff --git a/AndroidManifest_common.xml b/AndroidManifest_common.xml
index c616c1e..d1bd37c 100644
--- a/AndroidManifest_common.xml
+++ b/AndroidManifest_common.xml
@@ -351,7 +351,20 @@
             </intent-filter>
         </activity>
 
-        <activity
+         <!-- Keep support for apps that expect the Compact editor -->
+         <activity-alias android:name="com.android.contacts.activities.CompactContactEditorActivity"
+             android:exported="true"
+             android:targetActivity=".activities.ContactEditorActivity">
+             <intent-filter>
+                 <action android:name="android.intent.action.INSERT" />
+                 <category android:name="android.intent.category.DEFAULT" />
+                 <data android:mimeType="vnd.android.cursor.dir/person" />
+                 <data android:mimeType="vnd.android.cursor.dir/contact" />
+                 <data android:mimeType="vnd.android.cursor.dir/raw_contact" />
+             </intent-filter>
+         </activity-alias>
+
+         <activity
             android:name=".activities.ContactEditorSpringBoardActivity"
             android:noHistory="true"
             android:theme="@style/TransparentThemeAppCompat">

res/layout/fragment_sim_import.xml

diff --git a/res/layout/fragment_sim_import.xml b/res/layout/fragment_sim_import.xml
index b0eb280..00336dd 100644
--- a/res/layout/fragment_sim_import.xml
+++ b/res/layout/fragment_sim_import.xml
@@ -41,7 +41,7 @@
                 style="@style/Widget.AppCompat.Button.Borderless"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="right|center_vertical"
+                android:layout_gravity="end|center_vertical"
                 android:text="@string/sim_import_button_text"
                 />
         </android.support.v7.widget.Toolbar>