Fix crash when dynamic_homepage flag is off.

This partially rolls back ag/5650901. We should revert this change when
dynamic_homepage flag is permanently on.

Change-Id: I5e340421d04bc20c77dd30395fd8522693807954
Fixes: 118444000
Test: manual
This commit is contained in:
Fan Zhang
2018-12-04 12:43:14 -08:00
parent 282a0d9222
commit e994d4665d
4 changed files with 77 additions and 21 deletions

View File

@@ -114,6 +114,14 @@
<uses-library android:name="org.apache.http.legacy" />
<!-- Settings -->
<!-- TODO(b/118444000): Remove this. -->
<activity android:name="SettingsActivity"
android:label="@string/settings_label_launcher"
android:launchMode="singleTask">
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
<activity android:name=".homepage.SettingsHomepageActivity"
android:label="@string/settings_label_launcher"
android:theme="@style/Theme.Settings.Home"