- moving all intent filters into a single activity in manifest file
- use a static class to map from action string into fragment that handles that action
Bug: 73470808
Test: make RunCarSettingsRoboTests -j96
Change-Id: Ibe9c2c6a786f3f4000ed7a816efc1a71ffa38b0f
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8947e9b..4fd10ea 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -84,6 +84,16 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+ <intent-filter android:priority="100">
+ <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+
+ <intent-filter android:priority="100">
+ <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+
<meta-data android:name="distractionOptimized" android:value="true"/>
</activity>
@@ -163,27 +173,6 @@
<meta-data android:name="distractionOptimized" android:value="true"/>
</activity>
- <activity
- android:name="EntryPointActivities$LocationSettingsActivity"
- android:label="@string/location_settings_title">
- <intent-filter android:priority="100">
- <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- <meta-data android:name="com.android.car.settings.FRAGMENT_CLASS"
- android:value="com.android.car.settings.location.LocationSettingsFragment" />
- </activity>
-
- <activity
- android:name="EntryPointActivities$WifiPickerActivity">
- <intent-filter android:priority="100">
- <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- <meta-data android:name="com.android.car.settings.FRAGMENT_CLASS"
- android:value="com.android.car.settings.wifi.WifiSettingsFragment" />
- </activity>
-
<service android:name=".bluetooth.BluetoothPairingService" />
<receiver android:name=".bluetooth.BluetoothPairingRequest">