Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d3c29aa authored by Wenyi Wang's avatar Wenyi Wang Committed by Android (Google) Code Review
Browse files

Merge "Merge src-N/ and src-pre-N/ and target API 24 (1/3)"

parents 0d4ba57e 5289a29b

Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ src_dirs := src $(contacts_common_dir)/src $(phone_common_dir)/src 
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 \

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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" />

src/com/android/contacts/ContactsDrawerActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.contacts; 


import android.app.FragmentManager;

import android.app.FragmentTransaction;

import android.content.Context;

import android.content.Intent;

import android.graphics.Color;

import android.graphics.PorterDuff;

src/com/android/contacts/group/GroupUtil.java

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.contacts.common.ContactPhotoManager; 
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 @@ import java.util.Set; 
/**

 * Group utility methods.

 */

@NeededForTesting

public final class GroupUtil {



    private static final String LEGACY_CONTACTS_AUTHORITY = "contacts";
@@ -170,6 +172,7 @@ public final class GroupUtil { 
     * 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 @@ public final class GroupUtil { 
    /**

     * 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) {

tests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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" />