LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Adapt to API constant changes" into klp-dev

Browse Source
This commit is contained in:
Tom O'Neill
2013-09-03 20:26:24 +00:00
committed by Android (Google) Code Review
parent 06f88fa1d1 3e01427b42
commit de6b89866c
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/SettingInjectorSample/AndroidManifest.xml
View File

@@ -31,51 +31,51 @@
<service android:name="com.example.android.injector.MyInjectorService" > <service android:name="com.example.android.injector.MyInjectorService" >
<intent-filter> <intent-filter>
<action android:name="com.android.settings.InjectedLocationSetting" /> <action android:name="android.location.SettingInjectorService" />
</intent-filter> </intent-filter>
<meta-data <meta-data
android:name="com.android.settings.InjectedLocationSetting" android:name="android.location.SettingInjectorService"
android:resource="@xml/my_injected_location_setting" /> android:resource="@xml/my_injected_location_setting" />
</service> </service>
<service android:name="com.example.android.injector.DisabledInjectorService" > <service android:name="com.example.android.injector.DisabledInjectorService" >
<intent-filter> <intent-filter>
<action android:name="com.android.settings.InjectedLocationSetting" /> <action android:name="android.location.SettingInjectorService" />
</intent-filter> </intent-filter>
<meta-data <meta-data
android:name="com.android.settings.InjectedLocationSetting" android:name="android.location.SettingInjectorService"
android:resource="@xml/disabled_injected_location_setting" /> android:resource="@xml/disabled_injected_location_setting" />
</service> </service>
<service android:name="com.example.android.injector.FailingInjectorService" > <service android:name="com.example.android.injector.FailingInjectorService" >
<intent-filter> <intent-filter>
<action android:name="com.android.settings.InjectedLocationSetting" /> <action android:name="android.location.SettingInjectorService" />
</intent-filter> </intent-filter>
<meta-data <meta-data
android:name="com.android.settings.InjectedLocationSetting" android:name="android.location.SettingInjectorService"
android:resource="@xml/failing_injected_location_setting" /> android:resource="@xml/failing_injected_location_setting" />
</service> </service>
<service android:name="com.example.android.injector.SlowInjectorService" > <service android:name="com.example.android.injector.SlowInjectorService" >
<intent-filter> <intent-filter>
<action android:name="com.android.settings.InjectedLocationSetting" /> <action android:name="android.location.SettingInjectorService" />
</intent-filter> </intent-filter>
<meta-data <meta-data
android:name="com.android.settings.InjectedLocationSetting" android:name="android.location.SettingInjectorService"
android:resource="@xml/slow_injected_location_setting" /> android:resource="@xml/slow_injected_location_setting" />
</service> </service>
<service android:name="com.example.android.injector.UpdatingInjectorService" > <service android:name="com.example.android.injector.UpdatingInjectorService" >
<intent-filter> <intent-filter>
<action android:name="com.android.settings.InjectedLocationSetting" /> <action android:name="android.location.SettingInjectorService" />
</intent-filter> </intent-filter>
<meta-data <meta-data
android:name="com.android.settings.InjectedLocationSetting" android:name="android.location.SettingInjectorService"
android:resource="@xml/updating_injected_location_setting" /> android:resource="@xml/updating_injected_location_setting" />
</service> </service>

2
apps/SettingInjectorSample/res/xml/disabled_injected_location_setting.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<injected-location-setting xmlns:android="http://schemas.android.com/apk/res/android" <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:icon="@drawable/ic_launcher"
android:settingsActivity="com.example.android.injector.MySettingActivity" android:settingsActivity="com.example.android.injector.MySettingActivity"
/> />

2
apps/SettingInjectorSample/res/xml/failing_injected_location_setting.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<injected-location-setting xmlns:android="http://schemas.android.com/apk/res/android" <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:icon="@drawable/ic_launcher"
android:settingsActivity="com.example.android.injector.MySettingActivity" android:settingsActivity="com.example.android.injector.MySettingActivity"
/> />

2
apps/SettingInjectorSample/res/xml/my_injected_location_setting.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<injected-location-setting xmlns:android="http://schemas.android.com/apk/res/android" <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:icon="@drawable/ic_my_injected_setting"
android:settingsActivity="com.example.android.injector.MySettingActivity" android:settingsActivity="com.example.android.injector.MySettingActivity"
/> />

2
apps/SettingInjectorSample/res/xml/slow_injected_location_setting.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<injected-location-setting xmlns:android="http://schemas.android.com/apk/res/android" <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:icon="@drawable/ic_launcher"
android:settingsActivity="com.example.android.injector.MySettingActivity" android:settingsActivity="com.example.android.injector.MySettingActivity"
/> />

2
apps/SettingInjectorSample/res/xml/updating_injected_location_setting.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<injected-location-setting xmlns:android="http://schemas.android.com/apk/res/android" <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:icon="@drawable/ic_launcher"
android:settingsActivity="com.example.android.injector.MySettingActivity" android:settingsActivity="com.example.android.injector.MySettingActivity"
/> />