Bump version to 1.3.06
am: 2d74058e2a
* commit '2d74058e2a5af841c0abbe0685089e37cd181342':
Bump version to 1.3.06
diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index fd26035..0e9591d 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -24,6 +24,7 @@
import android.content.res.TypedArray;
import android.os.Bundle;
import android.preference.PreferenceManager;
+import android.support.v4.content.ContextCompat;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -44,6 +45,7 @@
import com.android.contacts.activities.ActionBarAdapter.Listener.Action;
import com.android.contacts.list.ContactsRequest;
+
/**
* Adapter for the action bar at the top of the Contacts activity.
*/
@@ -502,11 +504,12 @@
private void updateStatusBarColor() {
if (mSelectionMode) {
- int cabStatusBarColor = mActivity.getResources().getColor(
+ final int cabStatusBarColor = mActivity.getResources().getColor(
R.color.contextual_selection_bar_status_bar_color);
mActivity.getWindow().setStatusBarColor(cabStatusBarColor);
} else {
- int normalStatusBarColor = mActivity.getColor(R.color.primary_color_dark);
+ final int normalStatusBarColor = ContextCompat.getColor(
+ mActivity, R.color.primary_color_dark);
mActivity.getWindow().setStatusBarColor(normalStatusBarColor);
}
}
diff --git a/src/com/android/contacts/editor/CompactContactEditorFragment.java b/src/com/android/contacts/editor/CompactContactEditorFragment.java
index cd7f0ab..3f401ee 100644
--- a/src/com/android/contacts/editor/CompactContactEditorFragment.java
+++ b/src/com/android/contacts/editor/CompactContactEditorFragment.java
@@ -205,7 +205,7 @@
public void updatePhoto(Uri uri) throws FileNotFoundException {
final Bitmap bitmap = ContactPhotoUtils.getBitmapFromUri(getActivity(), uri);
if (bitmap == null || bitmap.getHeight() <= 0 || bitmap.getWidth() <= 0) {
- Toast.makeText(getContext(), R.string.contactPhotoSavedErrorToast,
+ Toast.makeText(mContext, R.string.contactPhotoSavedErrorToast,
Toast.LENGTH_SHORT).show();
return;
}
diff --git a/src/com/android/contacts/editor/CompactPhotoSelectionFragment.java b/src/com/android/contacts/editor/CompactPhotoSelectionFragment.java
index bd6444f..fe725c0 100644
--- a/src/com/android/contacts/editor/CompactPhotoSelectionFragment.java
+++ b/src/com/android/contacts/editor/CompactPhotoSelectionFragment.java
@@ -226,14 +226,14 @@
// Bind the photo
final ImageView imageView = (ImageView) photoItemView.findViewById(R.id.image);
if (photo.updatedPhotoUri != null) {
- EditorUiUtils.loadPhoto(ContactPhotoManager.getInstance(getContext()),
+ EditorUiUtils.loadPhoto(ContactPhotoManager.getInstance(mContext),
imageView, photo.updatedPhotoUri);
} else {
final Long photoFileId = EditorUiUtils.getPhotoFileId(photo.valuesDelta);
if (photoFileId != null) {
final Uri photoUri = ContactsContract.DisplayPhoto.CONTENT_URI.buildUpon()
.appendPath(photoFileId.toString()).build();
- EditorUiUtils.loadPhoto(ContactPhotoManager.getInstance(getContext()),
+ EditorUiUtils.loadPhoto(ContactPhotoManager.getInstance(mContext),
imageView, photoUri);
} else {
imageView.setImageBitmap(EditorUiUtils.getPhotoBitmap(photo.valuesDelta));
@@ -366,4 +366,9 @@
return super.onOptionsItemSelected(item);
}
}
+
+ @Override
+ public Context getContext() {
+ return getActivity();
+ }
}
\ No newline at end of file
diff --git a/src/com/android/contacts/list/ContactsUnavailableFragment.java b/src/com/android/contacts/list/ContactsUnavailableFragment.java
index bd811b2..293ed04 100644
--- a/src/com/android/contacts/list/ContactsUnavailableFragment.java
+++ b/src/com/android/contacts/list/ContactsUnavailableFragment.java
@@ -16,6 +16,7 @@
package com.android.contacts.list;
import android.app.Fragment;
+import android.content.Context;
import android.graphics.PorterDuff;
import android.os.Bundle;
import android.provider.ContactsContract.ProviderStatus;
@@ -157,4 +158,9 @@
}
}
}
+
+ @Override
+ public Context getContext() {
+ return getActivity();
+ }
}
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index d552c96..0af5984 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -67,6 +67,7 @@
import android.provider.ContactsContract.Intents;
import android.provider.ContactsContract.QuickContact;
import android.provider.ContactsContract.RawContacts;
+import android.support.v4.content.ContextCompat;
import android.support.v7.graphics.Palette;
import android.support.v7.widget.CardView;
import android.telecom.PhoneAccount;
@@ -183,9 +184,6 @@
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
-import android.graphics.PorterDuff;
-import android.support.v4.content.ContextCompat;
-
/**
* Mostly translucent {@link Activity} that shows QuickContact dialog. It loads
* data asynchronously, and then shows a popup with details centered around
@@ -644,10 +642,11 @@
private void enableLinkButton() {
mSuggestionsLinkButton.setClickable(true);
- mSuggestionsLinkButton.getBackground().setColorFilter(getResources().getColor(
- R.color.primary_color, getTheme()), PorterDuff.Mode.SRC_ATOP);
- mSuggestionsLinkButton.setTextColor(getResources().getColor(android.R.color.white,
- getTheme()));
+ mSuggestionsLinkButton.getBackground().setColorFilter(
+ ContextCompat.getColor(this, R.color.primary_color),
+ PorterDuff.Mode.SRC_ATOP);
+ mSuggestionsLinkButton.setTextColor(
+ ContextCompat.getColor(this, android.R.color.white));
mSuggestionsLinkButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
@@ -669,10 +668,10 @@
private void disableLinkButton() {
mSuggestionsLinkButton.setClickable(false);
mSuggestionsLinkButton.getBackground().setColorFilter(
- getResources().getColor(R.color.disabled_button_background, getTheme()),
+ ContextCompat.getColor(this, R.color.disabled_button_background),
PorterDuff.Mode.SRC_ATOP);
mSuggestionsLinkButton.setTextColor(
- getResources().getColor(R.color.disabled_button_text, getTheme()));
+ ContextCompat.getColor(this, R.color.disabled_button_text));
}
private interface ContextMenuIds {