Skip to content

Commit 7b7c934

Browse files
brave-buildssujitacharya2005
authored andcommitted
Uplift of #17116 (squashed) to beta
1 parent 40c04b5 commit 7b7c934

File tree

3 files changed

+28
-17
lines changed

3 files changed

+28
-17
lines changed

android/java/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" />
88

99
<activity android:name="org.chromium.chrome.browser.BraveRewardsSiteBannerActivity"
10-
android:theme="@android:style/Theme.Translucent.NoTitleBar"
10+
android:theme="@style/BraveTranslucent"
1111
android:screenOrientation="sensorPortrait"
1212
tools:ignore="LockedOrientationActivity" />
1313

android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java

+25-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
/* This Source Code Form is subject to the terms of the Mozilla Public
1+
/* Copyright (c) 2023 The Brave Authors. All rights reserved.
2+
* This Source Code Form is subject to the terms of the Mozilla Public
23
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
3-
* You can obtain one at http://mozilla.org/MPL/2.0/. */
4+
* You can obtain one at https://mozilla.org/MPL/2.0/. */
45

56
package org.chromium.chrome.browser;
67

@@ -18,6 +19,7 @@
1819
import org.chromium.base.Log;
1920
import org.chromium.chrome.R;
2021
import org.chromium.chrome.browser.BraveRewardsNativeWorker;
22+
import org.chromium.chrome.browser.init.AsyncInitializationActivity;
2123
import org.chromium.chrome.browser.rewards.BraveRewardsAmountChangeListener;
2224
import org.chromium.chrome.browser.rewards.BraveRewardsBannerInfo;
2325
import org.chromium.chrome.browser.rewards.BraveRewardsCreatorPanelFragment;
@@ -26,9 +28,9 @@
2628
import org.chromium.chrome.browser.rewards.BraveRewardsTipFailureFragment;
2729
import org.chromium.chrome.browser.rewards.BraveRewardsTippingPanelFragment;
2830

29-
public class BraveRewardsSiteBannerActivity
30-
extends FragmentActivity implements BraveRewardsTipConfirmationListener,
31-
BraveRewardsAmountChangeListener, BraveRewardsObserver {
31+
public class BraveRewardsSiteBannerActivity extends AsyncInitializationActivity
32+
implements BraveRewardsTipConfirmationListener, BraveRewardsAmountChangeListener,
33+
BraveRewardsObserver {
3234
private ToggleButton radio_tip_amount[] = new ToggleButton[3];
3335
public static final String TAB_ID_EXTRA = "currentTabId";
3436
public static final String IS_MONTHLY_CONTRIBUTION = "is_monthly_contribution";
@@ -60,24 +62,32 @@ public class BraveRewardsSiteBannerActivity
6062
private static final String TAG = "TippingBanner";
6163

6264
@Override
63-
protected void onCreate(Bundle savedInstanceState) {
64-
65-
//inflate
66-
super.onCreate(savedInstanceState);
65+
protected void triggerLayoutInflation() {
66+
// inflate
6767
setContentView(R.layout.brave_rewards_site_banner);
6868
mIsActivityIsActive = true;
6969
mProgressBar = findViewById(R.id.progressBar);
70-
mBraveRewardsNativeWorker = BraveRewardsNativeWorker.getInstance();
71-
mBraveRewardsNativeWorker.AddObserver(this);
7270

7371
currentTabId_ = IntentUtils.safeGetIntExtra(getIntent(), TAB_ID_EXTRA, -1);
7472
mIsMonthlyContribution =
7573
IntentUtils.safeGetBooleanExtra(getIntent(), IS_MONTHLY_CONTRIBUTION, false);
76-
if (savedInstanceState == null) {
77-
mBraveRewardsNativeWorker.GetPublisherBanner(
78-
mBraveRewardsNativeWorker.GetPublisherId(currentTabId_));
79-
}
74+
8075
clickOnCloseButton();
76+
onInitialLayoutInflationComplete();
77+
}
78+
79+
@Override
80+
public void finishNativeInitialization() {
81+
super.finishNativeInitialization();
82+
mBraveRewardsNativeWorker = BraveRewardsNativeWorker.getInstance();
83+
mBraveRewardsNativeWorker.AddObserver(this);
84+
mBraveRewardsNativeWorker.GetPublisherBanner(
85+
mBraveRewardsNativeWorker.GetPublisherId(currentTabId_));
86+
}
87+
88+
@Override
89+
public boolean shouldStartGpuProcess() {
90+
return true;
8191
}
8292

8393
private void clickOnCloseButton() {

android/java/res/layout/brave_rewards_tipping_panel.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,8 @@
234234
android:layout_width="0dp"
235235
android:layout_height="wrap_content"
236236
app:layout_constraintStart_toStartOf="@id/divider_line"
237-
app:layout_constraintEnd_toEndOf="@id/divider_line"/>
237+
app:layout_constraintEnd_toEndOf="@id/divider_line"
238+
android:elevation="5dp"/>
238239

239240
<TextView
240241
android:id="@+id/processing_fee"

0 commit comments

Comments
 (0)