diff options
author | Tony Mantler <nicoya@google.com> | 2016-10-24 14:26:27 -0700 |
---|---|---|
committer | gitbuildkicker <android-build@google.com> | 2016-10-25 15:14:57 -0700 |
commit | 56f0b05ec5c16cc705764f0c09e6cf2e73bf293b (patch) | |
tree | 2f6f413bf6fffca51d0afb309cc087cc18ee11fe | |
parent | 0233bf4cf1105b49cc69c830a2e3c2fae17a2abe (diff) | |
download | TvSettings-nougat-mr1.1-release.tar.gz |
Add activity for android.settings.WEBVIEW_SETTINGSandroid-7.1.1_r58android-7.1.1_r54android-7.1.1_r53android-7.1.1_r51android-7.1.1_r49android-7.1.1_r47android-7.1.1_r46android-7.1.1_r44android-7.1.1_r43android-7.1.1_r41android-7.1.1_r39android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r27android-7.1.1_r24android-7.1.1_r2android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1nougat-mr1.4-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-flounder-release
b/32307358
Test: adb shell am start -a android.settings.WEBVIEW_SETTINGS
Change-Id: I6fffef7791976d0a696ea372f1d884f5e4d43f64
(cherry picked from commit 956cbe0a2e22c4118dcd4e4dba4601a706e1286b)
-rw-r--r-- | Settings/AndroidManifest.xml | 14 | ||||
-rw-r--r-- | Settings/src/com/android/tv/settings/system/WebViewImplementation.java | 30 |
2 files changed, 44 insertions, 0 deletions
diff --git a/Settings/AndroidManifest.xml b/Settings/AndroidManifest.xml index 92240e717..882b561d5 100644 --- a/Settings/AndroidManifest.xml +++ b/Settings/AndroidManifest.xml @@ -559,6 +559,20 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity> + + <!-- 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"> + <intent-filter> + <action android:name="android.settings.WEBVIEW_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> </manifest> diff --git a/Settings/src/com/android/tv/settings/system/WebViewImplementation.java b/Settings/src/com/android/tv/settings/system/WebViewImplementation.java new file mode 100644 index 000000000..8853b4188 --- /dev/null +++ b/Settings/src/com/android/tv/settings/system/WebViewImplementation.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.tv.settings.system; + +import android.annotation.Nullable; +import android.app.Activity; +import android.os.Bundle; + +// 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); + finish(); + } +} |