summaryrefslogtreecommitdiffstats
path: root/src/com/android/contacts/editor/ContactEditorFragment.java
diff options
context:
space:
mode:
authorWalter Jang <wjang@google.com>2015-05-27 11:00:55 -0700
committerWalter Jang <wjang@google.com>2015-06-01 17:27:03 -0700
commit3593f2379784e2d89dd6c2430f8c2b944483a1f8 (patch)
tree808a012cf63262b5484508613929ab7c2e4c2ffd /src/com/android/contacts/editor/ContactEditorFragment.java
parent403743a0694aae952f3fd00235b7929dde3e1eca (diff)
downloadpackages_apps_Contacts-3593f2379784e2d89dd6c2430f8c2b944483a1f8.tar.gz
packages_apps_Contacts-3593f2379784e2d89dd6c2430f8c2b944483a1f8.tar.bz2
packages_apps_Contacts-3593f2379784e2d89dd6c2430f8c2b944483a1f8.zip
Only use one hint color on contact editors
Also, use the current 25% of black color which already follows the material guideline. Screenshots go/b21442589 Bug 21442589 Change-Id: I82c837fd9856c2165d3264a581165eb32702d807
Diffstat (limited to 'src/com/android/contacts/editor/ContactEditorFragment.java')
-rw-r--r--src/com/android/contacts/editor/ContactEditorFragment.java47
1 files changed, 0 insertions, 47 deletions
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index e9b371503..458e32554 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -269,10 +269,6 @@ public class ContactEditorFragment extends ContactEditorBaseFragment implements
if (activity.isFinishing()) {
return;
}
- if (request == EditorListener.EDITOR_FOCUS_CHANGED) {
- adjustNameFieldsHintDarkness(rawContactEditor);
- return;
- }
if (!isEditingUserProfile()) {
if (request == EditorListener.FIELD_CHANGED) {
if (!nameValuesDelta.isSuperPrimary()) {
@@ -294,23 +290,6 @@ public class ContactEditorFragment extends ContactEditorBaseFragment implements
public void onDeleteRequested(Editor removedEditor) {
}
};
- final EditorListener otherNamesListener = new EditorListener() {
-
- @Override
- public void onRequest(int request) {
- // Make sure the activity is running
- if (activity.isFinishing()) {
- return;
- }
- if (request == EditorListener.EDITOR_FOCUS_CHANGED) {
- adjustNameFieldsHintDarkness(rawContactEditor);
- }
- }
-
- @Override
- public void onDeleteRequested(Editor removedEditor) {
- }
- };
final StructuredNameEditorView nameEditor = rawContactEditor.getNameEditor();
if (mRequestFocus) {
@@ -322,22 +301,13 @@ public class ContactEditorFragment extends ContactEditorBaseFragment implements
nameEditor.setDisplayName(mDefaultDisplayName);
}
- final TextFieldsEditorView phoneticNameEditor =
- rawContactEditor.getPhoneticNameEditor();
- phoneticNameEditor.setEditorListener(otherNamesListener);
rawContactEditor.setAutoAddToDefaultGroup(mAutoAddToDefaultGroup);
- final TextFieldsEditorView nickNameEditor =
- rawContactEditor.getNickNameEditor();
- nickNameEditor.setEditorListener(otherNamesListener);
-
if (isAggregationSuggestionRawContactId(rawContactId)) {
acquireAggregationSuggestions(activity,
rawContactEditor.getNameEditor().getRawContactId(),
rawContactEditor.getNameEditor().getValues());
}
-
- adjustNameFieldsHintDarkness(rawContactEditor);
}
}
@@ -427,23 +397,6 @@ public class ContactEditorFragment extends ContactEditorBaseFragment implements
}
/**
- * Adjust how dark the hint text should be on all the names' text fields.
- *
- * @param rawContactEditor editor to update
- */
- private void adjustNameFieldsHintDarkness(RawContactEditorView rawContactEditor) {
- // Check whether fields contain focus by calling findFocus() instead of hasFocus().
- // The hasFocus() value is not necessarily up to date.
- final boolean nameFieldsAreNotFocused
- = rawContactEditor.getNameEditor().findFocus() == null
- && rawContactEditor.getPhoneticNameEditor().findFocus() == null
- && rawContactEditor.getNickNameEditor().findFocus() == null;
- rawContactEditor.getNameEditor().setHintColorDark(!nameFieldsAreNotFocused);
- rawContactEditor.getPhoneticNameEditor().setHintColorDark(!nameFieldsAreNotFocused);
- rawContactEditor.getNickNameEditor().setHintColorDark(!nameFieldsAreNotFocused);
- }
-
- /**
* Update the values in {@link #mExpandedEditors}.
*/
private void updatedExpandedEditorsMap() {