Merge src-N/ and src-pre-N/ and target API 24 (1/3)
Bug 29725318
Bug 29328819
Bug 29536552
Change-Id: I21854806fbf5c9a6e0fff3d12702bfaa96e04b26
diff --git a/Android.mk b/Android.mk
index 597c2ef..0546bc9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,8 +16,6 @@
res_dirs := res $(contacts_common_dir)/res $(phone_common_dir)/res
asset_dirs := $(contacts_common_dir)/assets
-src_dirs += src-N $(contacts_common_dir)/src-N $(phone_common_dir)/src-N
-
LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \
$(support_library_root_dir)/design/res \
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3700c9f..72004a4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,7 +19,7 @@
android:versionCode="10505"
android:versionName="1.5.5">
- <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="23" />
+ <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="24" />
<original-package android:name="com.android.contacts" />
diff --git a/src/com/android/contacts/ContactsDrawerActivity.java b/src/com/android/contacts/ContactsDrawerActivity.java
index 1dc7092..2d719a9 100644
--- a/src/com/android/contacts/ContactsDrawerActivity.java
+++ b/src/com/android/contacts/ContactsDrawerActivity.java
@@ -18,7 +18,6 @@
import android.app.FragmentManager;
import android.app.FragmentTransaction;
-import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.PorterDuff;
diff --git a/src/com/android/contacts/group/GroupUtil.java b/src/com/android/contacts/group/GroupUtil.java
index a031106..ca64411 100644
--- a/src/com/android/contacts/group/GroupUtil.java
+++ b/src/com/android/contacts/group/GroupUtil.java
@@ -33,6 +33,7 @@
import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
import com.android.contacts.common.list.ContactsSectionIndexer;
import com.android.contacts.common.model.account.GoogleAccountType;
+import com.android.contacts.common.testing.NeededForTesting;
import com.google.common.base.Objects;
import java.util.ArrayList;
@@ -44,6 +45,7 @@
/**
* Group utility methods.
*/
+@NeededForTesting
public final class GroupUtil {
private static final String LEGACY_CONTACTS_AUTHORITY = "contacts";
@@ -170,6 +172,7 @@
* number of remaining elements in cursor. If count is more than what's in the indexer now,
* then we don't need to trim.
*/
+ @NeededForTesting
public static boolean needTrimming(int count, int[] counts, int[] positions) {
// The sum of the last element in counts[] and the last element in positions[] is
// the total number of remaining elements in cursor. If mCount is more than
@@ -181,6 +184,7 @@
/**
* Update Bundle extras so as to update indexer.
*/
+ @NeededForTesting
public static void updateBundle(Bundle bundle, ContactsSectionIndexer indexer,
List<Integer> subscripts, String[] sections, int[] counts) {
for (int i : subscripts) {
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index adc62dc..e82cea8 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -19,7 +19,7 @@
<uses-sdk
android:minSdkVersion="21"
- android:targetSdkVersion="23" />
+ android:targetSdkVersion="24" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_CONTACTS" />