Adapt to API constant changes
- Affects b/10461474
Change-Id: I08bf5e1bd389428233638b1a19ec06a10393380f
diff --git a/apps/SettingInjectorSample/AndroidManifest.xml b/apps/SettingInjectorSample/AndroidManifest.xml
index dafe131..ef8f838 100644
--- a/apps/SettingInjectorSample/AndroidManifest.xml
+++ b/apps/SettingInjectorSample/AndroidManifest.xml
@@ -31,51 +31,51 @@
<service android:name="com.example.android.injector.MyInjectorService" >
<intent-filter>
- <action android:name="com.android.settings.InjectedLocationSetting" />
+ <action android:name="android.location.SettingInjectorService" />
</intent-filter>
<meta-data
- android:name="com.android.settings.InjectedLocationSetting"
+ android:name="android.location.SettingInjectorService"
android:resource="@xml/my_injected_location_setting" />
</service>
<service android:name="com.example.android.injector.DisabledInjectorService" >
<intent-filter>
- <action android:name="com.android.settings.InjectedLocationSetting" />
+ <action android:name="android.location.SettingInjectorService" />
</intent-filter>
<meta-data
- android:name="com.android.settings.InjectedLocationSetting"
+ android:name="android.location.SettingInjectorService"
android:resource="@xml/disabled_injected_location_setting" />
</service>
<service android:name="com.example.android.injector.FailingInjectorService" >
<intent-filter>
- <action android:name="com.android.settings.InjectedLocationSetting" />
+ <action android:name="android.location.SettingInjectorService" />
</intent-filter>
<meta-data
- android:name="com.android.settings.InjectedLocationSetting"
+ android:name="android.location.SettingInjectorService"
android:resource="@xml/failing_injected_location_setting" />
</service>
<service android:name="com.example.android.injector.SlowInjectorService" >
<intent-filter>
- <action android:name="com.android.settings.InjectedLocationSetting" />
+ <action android:name="android.location.SettingInjectorService" />
</intent-filter>
<meta-data
- android:name="com.android.settings.InjectedLocationSetting"
+ android:name="android.location.SettingInjectorService"
android:resource="@xml/slow_injected_location_setting" />
</service>
<service android:name="com.example.android.injector.UpdatingInjectorService" >
<intent-filter>
- <action android:name="com.android.settings.InjectedLocationSetting" />
+ <action android:name="android.location.SettingInjectorService" />
</intent-filter>
<meta-data
- android:name="com.android.settings.InjectedLocationSetting"
+ android:name="android.location.SettingInjectorService"
android:resource="@xml/updating_injected_location_setting" />
</service>
diff --git a/apps/SettingInjectorSample/res/xml/disabled_injected_location_setting.xml b/apps/SettingInjectorSample/res/xml/disabled_injected_location_setting.xml
index b44e2f8..86e7d2d 100644
--- a/apps/SettingInjectorSample/res/xml/disabled_injected_location_setting.xml
+++ b/apps/SettingInjectorSample/res/xml/disabled_injected_location_setting.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<injected-location-setting xmlns:android="http://schemas.android.com/apk/res/android"
- android:label="@string/disabled_setting_label"
+ android:title="@string/disabled_setting_label"
android:icon="@drawable/ic_launcher"
android:settingsActivity="com.example.android.injector.MySettingActivity"
/>
diff --git a/apps/SettingInjectorSample/res/xml/failing_injected_location_setting.xml b/apps/SettingInjectorSample/res/xml/failing_injected_location_setting.xml
index c632711..ae68d9d 100644
--- a/apps/SettingInjectorSample/res/xml/failing_injected_location_setting.xml
+++ b/apps/SettingInjectorSample/res/xml/failing_injected_location_setting.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<injected-location-setting xmlns:android="http://schemas.android.com/apk/res/android"
- android:label="@string/failing_setting_label"
+ android:title="@string/failing_setting_label"
android:icon="@drawable/ic_launcher"
android:settingsActivity="com.example.android.injector.MySettingActivity"
/>
diff --git a/apps/SettingInjectorSample/res/xml/my_injected_location_setting.xml b/apps/SettingInjectorSample/res/xml/my_injected_location_setting.xml
index 9736b53..716cf39 100644
--- a/apps/SettingInjectorSample/res/xml/my_injected_location_setting.xml
+++ b/apps/SettingInjectorSample/res/xml/my_injected_location_setting.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<injected-location-setting xmlns:android="http://schemas.android.com/apk/res/android"
- android:label="@string/my_injected_setting_label"
+ android:title="@string/my_injected_setting_label"
android:icon="@drawable/ic_my_injected_setting"
android:settingsActivity="com.example.android.injector.MySettingActivity"
/>
diff --git a/apps/SettingInjectorSample/res/xml/slow_injected_location_setting.xml b/apps/SettingInjectorSample/res/xml/slow_injected_location_setting.xml
index dfa5872..f902cf3 100644
--- a/apps/SettingInjectorSample/res/xml/slow_injected_location_setting.xml
+++ b/apps/SettingInjectorSample/res/xml/slow_injected_location_setting.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<injected-location-setting xmlns:android="http://schemas.android.com/apk/res/android"
- android:label="@string/slow_setting_label"
+ android:title="@string/slow_setting_label"
android:icon="@drawable/ic_launcher"
android:settingsActivity="com.example.android.injector.MySettingActivity"
/>
diff --git a/apps/SettingInjectorSample/res/xml/updating_injected_location_setting.xml b/apps/SettingInjectorSample/res/xml/updating_injected_location_setting.xml
index 852e595..0e16125 100644
--- a/apps/SettingInjectorSample/res/xml/updating_injected_location_setting.xml
+++ b/apps/SettingInjectorSample/res/xml/updating_injected_location_setting.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<injected-location-setting xmlns:android="http://schemas.android.com/apk/res/android"
- android:label="@string/updating_setting_label"
+ android:title="@string/updating_setting_label"
android:icon="@drawable/ic_launcher"
android:settingsActivity="com.example.android.injector.MySettingActivity"
/>
