empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix incorrect string resource usage for some activities.

Browse source
This commit is contained in:
Cody Henthorne 2020-12-03 10:29:56 -05:00 • committed by Greyson Parrelli
parent b1d74e21e2
commit 82eebbc3b0
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View file

@ -275,7 +275,6 @@
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" /> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
<activity android:name=".messagedetails.MessageDetailsActivity" <activity android:name=".messagedetails.MessageDetailsActivity"
android:label="@string/AndroidManifest__message_details"
android:windowSoftInputMode="stateHidden" android:windowSoftInputMode="stateHidden"
android:launchMode="singleTask" android:launchMode="singleTask"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
@ -374,7 +373,6 @@
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
<activity android:name=".logsubmit.SubmitDebugLogActivity" <activity android:name=".logsubmit.SubmitDebugLogActivity"
android:label="@string/AndroidManifest__log_submit"
android:windowSoftInputMode="stateHidden" android:windowSoftInputMode="stateHidden"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

1
app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
View file

@ -58,6 +58,7 @@ public class SubmitDebugLogActivity extends BaseActivity implements SubmitDebugL
dynamicTheme.onCreate(this); dynamicTheme.onCreate(this);
setContentView(R.layout.submit_debug_log_activity); setContentView(R.layout.submit_debug_log_activity);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setTitle(R.string.AndroidManifest__log_submit);
initView(); initView();
initViewModel(); initViewModel();

4
app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsActivity.java
View file

@ -115,8 +115,8 @@ public final class MessageDetailsActivity extends PassphraseRequiredActivity {
} }
private void initializeActionBar() { private void initializeActionBar() {
assert getSupportActionBar() != null; requireSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); requireSupportActionBar().setTitle(R.string.AndroidManifest__message_details);
viewModel.getRecipientColor().observe(this, this::setActionBarColor); viewModel.getRecipientColor().observe(this, this::setActionBarColor);
} }