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

Commit e837ae3e authored by Walter Jang's avatar Walter Jang
Browse files

Consolidate commonbind and contactsbind (1/2) 

On the AOSP contacts side, we simple change the
name of the commonbind package to contactsbind.

Test: Ran ContactsTests unit tests
Bug: 30759296

Change-Id: I0b3d1eed637a7f48705f8ec22e6fb97078444b88
parent fe33e363

proguard.flags

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ 




-keep class com.android.contacts.common.** { *;}

-keep class com.android.contacts.common.** { *;}

# For test:

# For test:

-keep class com.android.contacts.commonbind.analytics.AnalyticsUtil { *;}

-keep class com.android.contactsbind.analytics.AnalyticsUtil { *;}

-keep class com.android.contacts.interactions.** { *;}

-keep class com.android.contacts.interactions.** { *;}

-keep class com.google.common.base.Objects { *;}

-keep class com.google.common.base.Objects { *;}

-keep class com.google.common.base.Preconditions { *;}

-keep class com.google.common.base.Preconditions { *;}

src-bind/com/android/commonbind/ObjectFactory.java→src-bind/com/android/contactsbind/ObjectFactory.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ 
 * or implied. See the License for the specific language governing permissions and limitations under

 * or implied. See the License for the specific language governing permissions and limitations under

 * the License.

 * the License.

 */

 */

package com.android.contacts.commonbind;

package com.android.contactsbind;





import com.android.contacts.common.logging.Logger;

import com.android.contacts.common.logging.Logger;

import com.android.contacts.common.preference.PreferenceManager;

import com.android.contacts.common.preference.PreferenceManager;

src-bind/com/android/commonbind/analytics/AnalyticsUtil.java→src-bind/com/android/contactsbind/analytics/AnalyticsUtil.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ 
 * the License.

 * the License.

 */

 */





package com.android.contacts.commonbind.analytics;

package com.android.contactsbind.analytics;





import android.app.Activity;

import android.app.Activity;

import android.app.Application;

import android.app.Application;

src-bind/com/android/commonbind/experiments/Flags.java→src-bind/com/android/contactsbind/experiments/Flags.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * See the License for the specific language governing permissions and

 * limitations under the License

 * limitations under the License

 */

 */

package com.android.contacts.commonbind.experiments;

package com.android.contactsbind.experiments;





import android.content.Context;

import android.content.Context;

src-bind/com/android/commonbind/util/UserAgentGenerator.java→src-bind/com/android/contactsbind/util/UserAgentGenerator.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License

 * limitations under the License

 */

 */





package com.android.contacts.commonbind.util;

package com.android.contactsbind.util;





import android.content.Context;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;