From 2987fd6c9a3970188e8cb66b428be8767ce06a0b Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 7 Jan 2021 21:14:50 +0530 Subject: [PATCH 1/4] update Toolbar title color --- .../activities/ContactEditorActivity.java | 46 +++++-------------- 1 file changed, 12 insertions(+), 34 deletions(-) diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java index 299f2470fb..a2a449f6c9 100644 --- a/src/com/android/contacts/activities/ContactEditorActivity.java +++ b/src/com/android/contacts/activities/ContactEditorActivity.java @@ -21,17 +21,13 @@ import android.app.FragmentTransaction; import android.content.ComponentName; import android.content.ContentValues; import android.content.Intent; -import android.graphics.Color; -import android.graphics.PorterDuff; -import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.provider.ContactsContract.QuickContact; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.View; -import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; import com.android.contacts.AppCompatContactsActivity; @@ -50,9 +46,13 @@ import com.android.contacts.util.ImplicitIntentsUtil; import java.io.FileNotFoundException; import java.util.ArrayList; -import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; +import android.graphics.Color; +import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; + import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; + /** * Contact editor with only the most important fields displayed initially. */ @@ -353,6 +353,7 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements setContentView(R.layout.contact_editor_activity); mToolbar = (Toolbar) findViewById(R.id.toolbar); + mToolbar.setTitleTextColor(getResources().getColor(R.color.color_default_primary_text)); setSupportActionBar(mToolbar); if (Intent.ACTION_EDIT.equals(action)) { mActionBarTitleResId = R.string.contact_editor_title_existing_contact; @@ -360,27 +361,18 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements mActionBarTitleResId = R.string.contact_editor_title_new_contact; } mToolbar.setTitle(mActionBarTitleResId); - mToolbar.setTitleTextColor(getResources().getColor(R.color.color_default_blue1)); // Set activity title for Talkback setTitle(mActionBarTitleResId); - if (savedState == null) { - // Create the editor and photo selection fragments - mFragment = new ContactEditorFragment(); - getFragmentManager().beginTransaction() - .add(R.id.fragment_container, getEditorFragment(), TAG_EDITOR_FRAGMENT) - .commit(); - } else { + mFragment = + (ContactEditor) getFragmentManager().findFragmentById(R.id.contact_editor_fragment); + + if (savedState != null) { // Restore state mPhotoMode = savedState.getInt(STATE_PHOTO_MODE); mActionBarTitleResId = savedState.getInt(STATE_ACTION_BAR_TITLE); mPhotoUri = Uri.parse(savedState.getString(STATE_PHOTO_URI)); - // Show/hide the editor and photo selection fragments (w/o animations) - mFragment = (ContactEditorFragment) getFragmentManager() - .findFragmentByTag(TAG_EDITOR_FRAGMENT); - final FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); - fragmentTransaction.show(getEditorFragment()).commit(); mToolbar.setTitle(mActionBarTitleResId); } @@ -394,11 +386,7 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements if (Intent.ACTION_INSERT.equals(action)) { DynamicShortcuts.reportShortcutUsed(this, DynamicShortcuts.SHORTCUT_ADD_CONTACT); } - - //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - //this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION); - //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color); - + // this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); if(Build.VERSION.SDK_INT >= 27) { this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | @@ -408,16 +396,6 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements } - @Override - protected void onPause() { - super.onPause(); - final InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE); - final View currentFocus = getCurrentFocus(); - if (imm != null && currentFocus != null) { - imm.hideSoftInputFromWindow(currentFocus.getWindowToken(), 0); - } - } - @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); -- GitLab From 8bd81597709d08b312222b08440ce0453d7788a4 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 7 Jan 2021 21:47:47 +0530 Subject: [PATCH 2/4] update Toolbar title color : bug fix --- src/com/android/contacts/activities/ContactEditorActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java index a2a449f6c9..0ee57a5037 100644 --- a/src/com/android/contacts/activities/ContactEditorActivity.java +++ b/src/com/android/contacts/activities/ContactEditorActivity.java @@ -25,7 +25,7 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.provider.ContactsContract.QuickContact; -import androidx.appcompat.widget.Toolbar; +import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.View; import android.view.inputmethod.InputMethodManager; -- GitLab From 675841cf06c2a49a05421922ec207f9c74a6dccd Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Fri, 8 Jan 2021 11:46:04 +0530 Subject: [PATCH 3/4] test crash on Create new contact --- src/com/android/contacts/activities/ContactEditorActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java index 0ee57a5037..91954171d6 100644 --- a/src/com/android/contacts/activities/ContactEditorActivity.java +++ b/src/com/android/contacts/activities/ContactEditorActivity.java @@ -353,7 +353,7 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements setContentView(R.layout.contact_editor_activity); mToolbar = (Toolbar) findViewById(R.id.toolbar); - mToolbar.setTitleTextColor(getResources().getColor(R.color.color_default_primary_text)); + // mToolbar.setTitleTextColor(getResources().getColor(R.color.color_default_primary_text)); setSupportActionBar(mToolbar); if (Intent.ACTION_EDIT.equals(action)) { mActionBarTitleResId = R.string.contact_editor_title_existing_contact; -- GitLab From 6d2a183b88958b39646c979a95a1ec3aca4c4515 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Fri, 8 Jan 2021 13:36:12 +0530 Subject: [PATCH 4/4] bux fixed --- .../activities/ContactEditorActivity.java | 46 ++++++++++++++----- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java index 91954171d6..24adb19731 100644 --- a/src/com/android/contacts/activities/ContactEditorActivity.java +++ b/src/com/android/contacts/activities/ContactEditorActivity.java @@ -21,6 +21,9 @@ import android.app.FragmentTransaction; import android.content.ComponentName; import android.content.ContentValues; import android.content.Intent; +import android.graphics.Color; +import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -28,6 +31,7 @@ import android.provider.ContactsContract.QuickContact; import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.View; +import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; import com.android.contacts.AppCompatContactsActivity; @@ -46,13 +50,9 @@ import com.android.contacts.util.ImplicitIntentsUtil; import java.io.FileNotFoundException; import java.util.ArrayList; -import android.graphics.Color; -import android.graphics.PorterDuff; -import android.graphics.drawable.Drawable; - +import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; - /** * Contact editor with only the most important fields displayed initially. */ @@ -192,7 +192,7 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements * Invoked after the contact is saved. */ void onSaveCompleted(boolean hadChanges, int saveMode, boolean saveSucceeded, - Uri contactLookupUri, Long joinContactId); + Uri contactLookupUri, Long joinContactId); /** * Invoked after the contact is joined. @@ -353,7 +353,6 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements setContentView(R.layout.contact_editor_activity); mToolbar = (Toolbar) findViewById(R.id.toolbar); - // mToolbar.setTitleTextColor(getResources().getColor(R.color.color_default_primary_text)); setSupportActionBar(mToolbar); if (Intent.ACTION_EDIT.equals(action)) { mActionBarTitleResId = R.string.contact_editor_title_existing_contact; @@ -361,18 +360,27 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements mActionBarTitleResId = R.string.contact_editor_title_new_contact; } mToolbar.setTitle(mActionBarTitleResId); + mToolbar.setTitleTextColor(getResources().getColor(R.color.color_default_primary_text)); // Set activity title for Talkback setTitle(mActionBarTitleResId); - mFragment = - (ContactEditor) getFragmentManager().findFragmentById(R.id.contact_editor_fragment); - - if (savedState != null) { + if (savedState == null) { + // Create the editor and photo selection fragments + mFragment = new ContactEditorFragment(); + getFragmentManager().beginTransaction() + .add(R.id.fragment_container, getEditorFragment(), TAG_EDITOR_FRAGMENT) + .commit(); + } else { // Restore state mPhotoMode = savedState.getInt(STATE_PHOTO_MODE); mActionBarTitleResId = savedState.getInt(STATE_ACTION_BAR_TITLE); mPhotoUri = Uri.parse(savedState.getString(STATE_PHOTO_URI)); + // Show/hide the editor and photo selection fragments (w/o animations) + mFragment = (ContactEditorFragment) getFragmentManager() + .findFragmentByTag(TAG_EDITOR_FRAGMENT); + final FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); + fragmentTransaction.show(getEditorFragment()).commit(); mToolbar.setTitle(mActionBarTitleResId); } @@ -386,7 +394,11 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements if (Intent.ACTION_INSERT.equals(action)) { DynamicShortcuts.reportShortcutUsed(this, DynamicShortcuts.SHORTCUT_ADD_CONTACT); } - // this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + + //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + //this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION); + //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color); + if(Build.VERSION.SDK_INT >= 27) { this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | @@ -396,6 +408,16 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements } + @Override + protected void onPause() { + super.onPause(); + final InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE); + final View currentFocus = getCurrentFocus(); + if (imm != null && currentFocus != null) { + imm.hideSoftInputFromWindow(currentFocus.getWindowToken(), 0); + } + } + @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); -- GitLab