Merge "Add intent handling for those that should already exist" into pi-car-dev
am: 518a0d8b1b
Change-Id: I8a86c87f1a53db7931b3fcc57d44bc921e8808e1
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 38080f8..37fa470 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -107,11 +107,22 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="1">
+ <intent-filter android:priority="100">
<action android:name="android.settings.DEVICE_INFO_SETTINGS" />
+ <action android:name="android.settings.DEVICE_NAME" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+ <intent-filter android:priority="100">
+ <action android:name="android.settings.LOCALE_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT"/>
+ </intent-filter>
+
+ <intent-filter android:priority="100">
+ <action android:name="android.settings.INPUT_METHOD_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT"/>
+ </intent-filter>
+
<intent-filter android:priority="1">
<action android:name="android.settings.APPLICATION_DETAILS_SETTINGS" />
<data android:scheme="package" />
@@ -120,6 +131,7 @@
<intent-filter android:priority="1">
<action android:name="android.settings.DATE_SETTINGS" />
+ <action android:name="android.intent.action.QUICK_CLOCK" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
@@ -147,6 +159,11 @@
</intent-filter>
<intent-filter android:priority="100">
+ <action android:name="android.settings.LOCATION_SCANNING_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT"/>
+ </intent-filter>
+
+ <intent-filter android:priority="100">
<action android:name="android.settings.SYNC_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
diff --git a/src/com/android/car/settings/common/FragmentResolver.java b/src/com/android/car/settings/common/FragmentResolver.java
index 800c314..0583951 100644
--- a/src/com/android/car/settings/common/FragmentResolver.java
+++ b/src/com/android/car/settings/common/FragmentResolver.java
@@ -31,6 +31,9 @@
import com.android.car.settings.bluetooth.BluetoothSettingsFragment;
import com.android.car.settings.datetime.DatetimeSettingsFragment;
import com.android.car.settings.display.DisplaySettingsFragment;
+import com.android.car.settings.inputmethod.KeyboardFragment;
+import com.android.car.settings.language.LanguagePickerFragment;
+import com.android.car.settings.location.LocationScanningFragment;
import com.android.car.settings.location.LocationSettingsFragment;
import com.android.car.settings.quicksettings.QuickSettingFragment;
import com.android.car.settings.sound.SoundSettingsFragment;
@@ -66,6 +69,9 @@
case Settings.ACTION_LOCATION_SOURCE_SETTINGS:
return new LocationSettingsFragment();
+ case Settings.ACTION_LOCATION_SCANNING_SETTINGS:
+ return new LocationScanningFragment();
+
case android.net.wifi.WifiManager.ACTION_PICK_WIFI_NETWORK:
case Settings.ACTION_WIFI_SETTINGS:
case Settings.ACTION_WIRELESS_SETTINGS:
@@ -80,6 +86,7 @@
case Settings.ACTION_BLUETOOTH_SETTINGS:
return new BluetoothSettingsFragment();
+ case Intent.ACTION_QUICK_CLOCK:
case Settings.ACTION_DATE_SETTINGS:
return new DatetimeSettingsFragment();
@@ -89,6 +96,12 @@
case Settings.ACTION_DISPLAY_SETTINGS:
return new DisplaySettingsFragment();
+ case Settings.ACTION_LOCALE_SETTINGS:
+ return new LanguagePickerFragment();
+
+ case Settings.ACTION_INPUT_METHOD_SETTINGS:
+ return new KeyboardFragment();
+
case Settings.ACTION_APPLICATION_SETTINGS:
case Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS:
case Settings.ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS:
@@ -109,11 +122,12 @@
return new ChooseAccountFragment();
case Settings.ACTION_DEVICE_INFO_SETTINGS:
+ case Settings.DEVICE_NAME_SETTINGS:
return new AboutSettingsFragment();
default:
return Fragment.instantiate(context,
- context.getString(R.string.config_settings_hierarchy_root_fragment));
+ context.getString(R.string.config_settings_hierarchy_root_fragment));
}
}
}