commit 775103a3fd787a434f57d05f0118eac861658017
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 08 20:37:43 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 08 20:37:43 2017 +0000
tree ca28a9ce6e5a50439c177aae67e18fdab7fad8b3
parent f28cb05f434c4366fa3070acd4b8d845eecc6d91
parent ff234e2cbdba0249763c2c342c57dcd6e7ba4319

Merge "Fixed issue that cannot bring My info via Android Beam"

Android.mk

diff --git a/Android.mk b/Android.mk
index e629e54..57d521e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,9 +46,7 @@
     android-support-v4 \
     com.android.vcard \
     guava \
-    libphonenumber \
-    legacy-android-test \
-    junit
+    libphonenumber
 
 LOCAL_PACKAGE_NAME := Contacts
 LOCAL_CERTIFICATE := shared

proguard.flags

diff --git a/proguard.flags b/proguard.flags
index 75fbfd7..07ec5d2 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -2,6 +2,11 @@
   public <init>(...);
 }
 
+# The support library contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version.  We know about them, and they are safe.
+-dontwarn android.support.**
+
 # Xml files containing onClick (menus and layouts) require that proguard not
 # remove their handlers.
 -keepclassmembers class * extends android.app.Activity {

src/com/android/contacts/drawer/DrawerAdapter.java

diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java
index 963c125..ef5df1b 100644
--- a/src/com/android/contacts/drawer/DrawerAdapter.java
+++ b/src/com/android/contacts/drawer/DrawerAdapter.java
@@ -33,6 +33,7 @@
 import com.android.contacts.model.account.AccountDisplayInfo;
 import com.android.contacts.model.account.AccountDisplayInfoFactory;
 import com.android.contacts.util.SharedPreferenceUtil;
+import com.android.contactsbind.HelpUtils;
 import com.android.contactsbind.ObjectFactory;
 
 import java.util.ArrayList;
@@ -118,8 +119,10 @@
         mMiscItems.add(new DividerItem());
         mMiscItems.add(new MiscItem(R.id.nav_settings, R.string.menu_settings,
                 R.drawable.quantum_ic_settings_vd_theme_24));
-        mMiscItems.add(new MiscItem(R.id.nav_help, R.string.menu_help,
-                R.drawable.quantum_ic_help_vd_theme_24));
+        if (HelpUtils.isHelpAndFeedbackAvailable()) {
+            mMiscItems.add(new MiscItem(R.id.nav_help, R.string.menu_help,
+                    R.drawable.quantum_ic_help_vd_theme_24));
+        }
         rebuildItemsList();
     }
 

src/com/android/contacts/editor/ContactEditorFragment.java

diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index da68ec6..ac07342 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -747,6 +747,9 @@
             });
         }
 
+        final MenuItem helpMenu = menu.findItem(R.id.menu_help);
+        helpMenu.setVisible(HelpUtils.isHelpAndFeedbackAvailable());
+
         int size = menu.size();
         for (int i = 0; i < size; i++) {
             menu.getItem(i).setEnabled(mEnabled);