[tor-commits] [orbot/master] small activity label cleanups (less java)

[n8fr8@xxxxxxxxxxxxxx]

commit 6057148cec699c1c68126adc8c5f409f0f25f984
Author: bim <dsnake@xxxxxxxxxxxxxx>
Date:   Wed Feb 3 10:54:23 2021 -0500

    small activity label cleanups (less java)
---
 app/src/main/AndroidManifest.xml                              | 11 +++++++----
 .../java/org/torproject/android/ui/AppManagerActivity.java    |  1 -
 .../android/ui/onboarding/BridgeWizardActivity.java           |  2 --
 .../android/ui/onboarding/CustomBridgesActivity.java          |  2 --
 .../org/torproject/android/ui/onboarding/MoatActivity.java    |  2 --
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a6afb24c..a9db7611 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -76,12 +76,11 @@
 
         <activity
             android:name=".core.ui.SettingsPreferencesActivity"
-            android:label="@string/app_name"
             android:theme="@style/Theme.AppCompat" />
 
         <activity
             android:name=".ui.AppManagerActivity"
-            android:label="@string/app_name"
+            android:label="@string/apps_mode"
             android:theme="@style/Theme.AppCompat" />
 
         <activity
@@ -108,12 +107,16 @@
 
         <activity
             android:name=".ui.onboarding.BridgeWizardActivity"
-            android:configChanges="orientation|screenSize" />
+            android:configChanges="orientation|screenSize"
+            android:label="@string/bridges" />
 
         <activity
+            android:label="@string/request_bridges"
             android:name=".ui.onboarding.MoatActivity"
             android:windowSoftInputMode="stateHidden" />
-        <activity android:name=".ui.onboarding.CustomBridgesActivity" />
+        <activity
+            android:name=".ui.onboarding.CustomBridgesActivity"
+            android:label="@string/use_custom_bridges" />
 
         <provider
             android:name=".ui.hiddenservices.providers.HSContentProvider"
diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
index 5d2493a4..9ad0a09f 100644
--- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
@@ -66,7 +66,6 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList
         pMgr = getPackageManager();
 
         this.setContentView(R.layout.layout_apps);
-        setTitle(R.string.apps_mode);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         listApps = findViewById(R.id.applistview);
         progressBar = findViewById(R.id.progressBar);
diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
index 465d8c58..2f29300d 100644
--- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
@@ -94,8 +94,6 @@ public class BridgeWizardActivity extends AppCompatActivity {
             mTvStatus.setText(savedInstanceState.getString(BUNDLE_KEY_TV_STATUS_TEXT, ""));
         }
 
-        setTitle(getString(R.string.bridges));
-
         findViewById(R.id.btnMoat).setOnClickListener(v -> {
             cancelHostTestIfRunning();
             startActivityForResult(new Intent(BridgeWizardActivity.this, MoatActivity.class), MOAT_REQUEST_CODE);
diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java
index 6d7817df..a8eeb30f 100644
--- a/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java
@@ -73,8 +73,6 @@ public class CustomBridgesActivity extends AppCompatActivity implements View.OnC
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        setTitle(getString(R.string.use_custom_bridges));
-
         ((TextView) findViewById(R.id.tvDescription)).setText(getString(R.string.in_a_browser, URL_TOR_BRIDGES));
 
         findViewById(R.id.btCopyUrl).setOnClickListener(this);
diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java
index 7431965d..756a9f5c 100644
--- a/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java
@@ -120,8 +120,6 @@ public class MoatActivity extends AppCompatActivity implements View.OnClickListe
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        setTitle(getString(R.string.request_bridges));
-
         mIvCaptcha = findViewById(R.id.captchaIv);
         mProgressBar = findViewById(R.id.progressBar);
         mEtSolution = findViewById(R.id.solutionEt);



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits