merge in nyc-mr1-release history after reset to nyc-mr1-dev
diff --git a/Settings/AndroidManifest.xml b/Settings/AndroidManifest.xml
index fbade5f..882b561 100644
--- a/Settings/AndroidManifest.xml
+++ b/Settings/AndroidManifest.xml
@@ -560,8 +560,9 @@
</intent-filter>
</activity>
- <!-- Dummy intent filters for CTS TODO: implement something useful -->
- <activity android:name=".EmptyStubActivity"
+ <!-- Dummy activity for CTS
+ TODO: implement something useful -->
+ <activity android:name=".system.WebViewImplementation"
android:exported="true"
android:excludeFromRecents="true"
android:theme="@android:style/Theme.NoDisplay">
@@ -569,25 +570,8 @@
<action android:name="android.settings.WEBVIEW_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="1">
- <action android:name="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- <intent-filter android:priority="1">
- <action android:name="android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="package" />
- </intent-filter>
- <intent-filter android:priority="1">
- <action android:name="android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="package" />
- </intent-filter>
- <intent-filter android:priority="1">
- <action android:name="android.settings.MANAGE_DEFAULT_APPS_SETTINGS" />
- <action android:name="android.settings.HOME_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
+ <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+ android:value="true" />
</activity>
</application>
diff --git a/Settings/src/com/android/tv/settings/EmptyStubActivity.java b/Settings/src/com/android/tv/settings/system/WebViewImplementation.java
similarity index 81%
rename from Settings/src/com/android/tv/settings/EmptyStubActivity.java
rename to Settings/src/com/android/tv/settings/system/WebViewImplementation.java
index ce6a699..8853b41 100644
--- a/Settings/src/com/android/tv/settings/EmptyStubActivity.java
+++ b/Settings/src/com/android/tv/settings/system/WebViewImplementation.java
@@ -14,13 +14,14 @@
* limitations under the License
*/
-package com.android.tv.settings;
+package com.android.tv.settings.system;
import android.annotation.Nullable;
import android.app.Activity;
import android.os.Bundle;
-public class EmptyStubActivity extends Activity {
+// TODO: implement a webview choice screen here. See WebViewImplementation in mobile Settings
+public class WebViewImplementation extends Activity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
