Skip to content

Commit

Permalink
Fix CI error with CR85
Browse files Browse the repository at this point in the history
  • Loading branch information
@deeppandya
deeppandya committed Aug 24, 2020
1 parent a3f2b77 commit dbccc5f
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 97 deletions.
174 changes: 82 additions & 92 deletions android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -718,123 +718,113 @@ public void OnGetReconcileStamp(long timestamp) {}
@Override
public void OnRecurringDonationUpdated() {}

<<< <<< < HEAD
@Override
public void OnResetTheWholeState(boolean success) {}
== == == =
@Override
public void OnRewardsMainEnabled(boolean enabled) {

Log.e("OnRewardsMainEnabled", "isEnabled : " + enabled);

@Override
public void OnRewardsMainEnabled(boolean enabled) {
SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();
SharedPreferences.Editor sharedPreferencesEditor = sharedPreferences.edit();
>>> >>> > Update UI with highlight view

@Override
public void OnRewardsMainEnabled(boolean enabled) {
SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();
SharedPreferences.Editor sharedPreferencesEditor = sharedPreferences.edit();
boolean needRelaunch = false;
if (enabled && sharedPreferences.getBoolean(PREF_HIDE_BRAVE_REWARDS_ICON, false)) {
sharedPreferencesEditor.putBoolean(PREF_HIDE_BRAVE_REWARDS_ICON, false);
needRelaunch = true;
}

boolean needRelaunch = false;
if (enabled && sharedPreferences.getBoolean(PREF_HIDE_BRAVE_REWARDS_ICON, false)) {
sharedPreferencesEditor.putBoolean(PREF_HIDE_BRAVE_REWARDS_ICON, false);
needRelaunch = true;
if (mBraveRewardsNotificationsCount != null) {
String count = mBraveRewardsNotificationsCount.getText().toString();
if (!count.isEmpty()) {
mBraveRewardsNotificationsCount.setVisibility(enabled ? View.VISIBLE : View.GONE);
}
}

if (mBraveRewardsNotificationsCount != null) {
String count = mBraveRewardsNotificationsCount.getText().toString();
if (!count.isEmpty()) {
mBraveRewardsNotificationsCount.setVisibility(enabled ? View.VISIBLE : View.GONE);
}
}
if (needRelaunch) BraveRelaunchUtils.askForRelaunch(getContext());
mIsRewardsEnabled = enabled;
updateVerifiedPublisherMark();
}

if (needRelaunch) BraveRelaunchUtils.askForRelaunch(getContext());
mIsRewardsEnabled = enabled;
updateVerifiedPublisherMark();
}
private void updateNotificationBadgeForNewInstall(boolean rewardsEnabled) {
SharedPreferences sharedPref = ContextUtils.getAppSharedPreferences();
boolean shownBefore = sharedPref.getBoolean(BraveRewardsPanelPopup.PREF_WAS_TOOLBAR_BAT_LOGO_BUTTON_PRESSED, false);
boolean shouldShow =
mBraveRewardsNotificationsCount != null && !shownBefore && !rewardsEnabled;
mIsInitialNotificationPosted = shouldShow; // initial notification

private void updateNotificationBadgeForNewInstall(boolean rewardsEnabled) {
SharedPreferences sharedPref = ContextUtils.getAppSharedPreferences();
boolean shownBefore = sharedPref.getBoolean(BraveRewardsPanelPopup.PREF_WAS_TOOLBAR_BAT_LOGO_BUTTON_PRESSED, false);
boolean shouldShow =
mBraveRewardsNotificationsCount != null && !shownBefore && !rewardsEnabled;
mIsInitialNotificationPosted = shouldShow; // initial notification
if (!shouldShow) return;

if (!shouldShow) return;
mBraveRewardsNotificationsCount.setText("");
mBraveRewardsNotificationsCount.setBackground(
getResources().getDrawable(R.drawable.brave_rewards_circle));
mBraveRewardsNotificationsCount.setVisibility(View.VISIBLE);
}

mBraveRewardsNotificationsCount.setText("");
mBraveRewardsNotificationsCount.setBackground(
getResources().getDrawable(R.drawable.brave_rewards_circle));
mBraveRewardsNotificationsCount.setVisibility(View.VISIBLE);
}
@Override
public void onThemeColorChanged(int color, boolean shouldAnimate) {
final int textBoxColor = ToolbarColors.getTextBoxColorForToolbarBackgroundInNonNativePage(
getResources(), color, isIncognito());
updateModernLocationBarColor(textBoxColor);
}

@Override
public void onThemeColorChanged(int color, boolean shouldAnimate) {
final int textBoxColor = ToolbarColors.getTextBoxColorForToolbarBackgroundInNonNativePage(
getResources(), color, isIncognito());
updateModernLocationBarColor(textBoxColor);
}
/**
* BraveRewardsNativeWorker.PublisherObserver:
* Update a 'verified publisher' checkmark on url bar BAT icon only if
* no notifications are posted.
*/
@Override
public void onFrontTabPublisherChanged(boolean verified) {
mIsPublisherVerified = verified;
updateVerifiedPublisherMark();
}

/**
* BraveRewardsNativeWorker.PublisherObserver:
* Update a 'verified publisher' checkmark on url bar BAT icon only if
* no notifications are posted.
*/
@Override
public void onFrontTabPublisherChanged(boolean verified) {
mIsPublisherVerified = verified;
updateVerifiedPublisherMark();
private void updateVerifiedPublisherMark() {
if (mBraveRewardsNotificationsCount == null) {
// Most likely we are on a custom page
return;
}

private void updateVerifiedPublisherMark() {
if (mBraveRewardsNotificationsCount == null) {
// Most likely we are on a custom page
return;
}
if (mIsInitialNotificationPosted) {
return;
} else if (!mIsRewardsEnabled) {
if (mIsInitialNotificationPosted) {
return;
} else if (!mIsRewardsEnabled) {
mBraveRewardsNotificationsCount.setBackgroundResource(0);
mBraveRewardsNotificationsCount.setVisibility(View.INVISIBLE);
} else if (!mIsNotificationPosted) {
if (mIsPublisherVerified) {
mBraveRewardsNotificationsCount.setVisibility(View.VISIBLE);
mBraveRewardsNotificationsCount.setBackground(
getResources().getDrawable(R.drawable.bat_verified));
} else {
mBraveRewardsNotificationsCount.setBackgroundResource(0);
mBraveRewardsNotificationsCount.setVisibility(View.INVISIBLE);
} else if (!mIsNotificationPosted) {
if (mIsPublisherVerified) {
mBraveRewardsNotificationsCount.setVisibility(View.VISIBLE);
mBraveRewardsNotificationsCount.setBackground(
getResources().getDrawable(R.drawable.bat_verified));
} else {
mBraveRewardsNotificationsCount.setBackgroundResource(0);
mBraveRewardsNotificationsCount.setVisibility(View.INVISIBLE);
}
}
}
}

@Override
public void onBottomToolbarVisibilityChanged(boolean isVisible) {
if (this instanceof ToolbarPhone && super.getMenuButtonWrapper() != null) {
super.getMenuButtonWrapper().setVisibility(isVisible ? View.GONE : View.VISIBLE);
}
@Override
public void onBottomToolbarVisibilityChanged(boolean isVisible) {
if (this instanceof ToolbarPhone && super.getMenuButtonWrapper() != null) {
super.getMenuButtonWrapper().setVisibility(isVisible ? View.GONE : View.VISIBLE);
}
}

private void updateShieldsLayoutBackground(boolean rounded) {
if (!(this instanceof ToolbarTablet) || (mShieldsLayout == null)) return;
private void updateShieldsLayoutBackground(boolean rounded) {
if (!(this instanceof ToolbarTablet) || (mShieldsLayout == null)) return;

if (rounded) {
mShieldsLayout.setBackgroundDrawable(ApiCompatibilityUtils.getDrawable(getContext().getResources(),
R.drawable.modern_toolbar_background_grey_end_segment));
mShieldsLayoutIsColorBackground = false;
} else {
mShieldsLayout.setBackgroundColor(ChromeColors.getDefaultThemeColor(getResources(), isIncognito()));
mShieldsLayoutIsColorBackground = true;
}
updateModernLocationBarColor(mCurrentToolbarColor);
if (rounded) {
mShieldsLayout.setBackgroundDrawable(ApiCompatibilityUtils.getDrawable(getContext().getResources(),
R.drawable.modern_toolbar_background_grey_end_segment));
mShieldsLayoutIsColorBackground = false;
} else {
mShieldsLayout.setBackgroundColor(ChromeColors.getDefaultThemeColor(getResources(), isIncognito()));
mShieldsLayoutIsColorBackground = true;
}
updateModernLocationBarColor(mCurrentToolbarColor);
}

@Override
View getMenuButtonWrapper() {
if (this instanceof ToolbarPhone && BottomToolbarVariationManager.isMenuButtonOnBottom()) {
return null;
}
return super.getMenuButtonWrapper();
@Override
View getMenuButtonWrapper() {
if (this instanceof ToolbarPhone && BottomToolbarVariationManager.isMenuButtonOnBottom()) {
return null;
}
return super.getMenuButtonWrapper();
}
}
12 changes: 7 additions & 5 deletions third_party/android_deps/libs/com_airbnb_android/com_airbnb_android.info
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# Generated by //build/android/gyp/aar.py
# To regenerate, use "update_android_aar_prebuilts = true" and run "gn gen".

aidl = [ ]
assets = [ ]
aidl = []
assets = []
has_classes_jar = true
has_native_libraries = false
has_proguard_flags = false
has_r_text_file = true
is_manifest_empty = true
resources = [ "res/values/values.xml" ]
subjar_tuples = [ ]
subjars = [ ]
resources = [
"res/values/values.xml"
]
subjar_tuples = []
subjars = []

0 comments on commit dbccc5f

Please sign in to comment.