Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,13 @@

<activity
android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
android:exported="false" />
android:exported="false"
android:theme="@style/AppTheme" />

<activity
android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
android:exported="false" />
android:exported="false"
android:theme="@style/AppTheme" />
Comment on lines 65 to +73

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[P1] Avoid removing action bar from Play Services license screens

Both license activities are now forced to use @style/AppTheme, which sets windowActionBar to false and windowNoTitle to true. The Google Play services OssLicensesMenuActivity/OssLicensesActivity provide their own content but rely on the host theme to supply an action bar for the title and the Up button. With the new theme the toolbar disappears, so the license UI shows neither a title nor back navigation unless the user presses the system back button. To keep the activities on-brand while preserving navigation, they should retain a theme variant with an action bar (e.g. AppThemeActionBar) or include an alternative navigation affordance.

Useful? React with 👍 / 👎.


<activity
android:name=".ui.screens.android.CodeActivity"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/xml/preferences_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
</androidx.preference.Preference>
<androidx.preference.Preference
app:icon="@drawable/ic_libraries"
app:key="open_source_licenses"
app:key="@string/key_open_source_licenses"
app:title="@string/open_source_licenses" />
<androidx.preference.Preference
app:icon="@drawable/ic_license"
Expand Down