diff options
author | Xin Li <delphij@google.com> | 2021-08-14 06:31:03 +0000 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2021-08-14 06:31:03 +0000 |
commit | 5fdafc025944254ed38f917e4aeb02c5c8446f29 (patch) | |
tree | a14c9134e4556b9ecc12559ea69aca438c032f45 | |
parent | 1c16a3e3e6e28be0b4175e565b541f34d88356c8 (diff) | |
parent | fc77ac29e2e796f8e9e4a0b1e548c4b8adbcdf54 (diff) | |
download | HTMLViewer-5fdafc025944254ed38f917e4aeb02c5c8446f29.tar.gz |
Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961
Merged-In: I2297b003c61c2e781b277d0ccfb7e9b715635978
Change-Id: I5fcea49e0ecab3433a0e369a44d42569ac5d40ae
-rw-r--r-- | Android.bp | 12 | ||||
-rw-r--r-- | AndroidManifest-car.xml | 42 | ||||
-rw-r--r-- | res/layout/main_car.xml | 24 | ||||
-rw-r--r-- | src/com/android/htmlviewer/CarHTMLViewerActivity.java | 45 | ||||
-rw-r--r-- | src/com/android/htmlviewer/HTMLViewerActivity.java | 6 |
5 files changed, 128 insertions, 1 deletions
@@ -17,6 +17,18 @@ license { android_app { name: "HTMLViewer", + manifest: "AndroidManifest.xml", srcs: ["**/*.java"], + exclude_srcs: ["src/com/android/htmlviewer/CarHTMLViewerActivity.java"], + sdk_version: "current", +} + +android_app { + name: "CarHTMLViewer", + manifest: "AndroidManifest-car.xml", + overrides: ["HTMLViewer"], + srcs: ["**/*.java"], + libs: ["android.car-stubs"], + static_libs: ["car-ui-lib"], sdk_version: "current", } diff --git a/AndroidManifest-car.xml b/AndroidManifest-car.xml new file mode 100644 index 0000000..2c737ea --- /dev/null +++ b/AndroidManifest-car.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2021 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. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.htmlviewer"> + <original-package android:name="com.android.htmlviewer"/> + + <application android:label="@string/app_label" + android:supportsRtl="true"> + <activity android:name="CarHTMLViewerActivity" + android:label="@string/app_label" + android:theme="@style/Theme.CarUi.WithToolbar" + android:exported="true"> + <intent-filter> + <category android:name="android.intent.category.DEFAULT"/> + <action android:name="android.intent.action.VIEW"/> + <data android:scheme="content"/> + <data android:mimeType="text/html"/> + <data android:mimeType="text/plain"/> + <data android:mimeType="application/xhtml+xml"/> + <data android:mimeType="application/vnd.wap.xhtml+xml"/> + </intent-filter> + </activity> + <meta-data android:name="android.nfc.disable_beam_default" + android:value="true"/> + <meta-data android:name="android.max_aspect" + android:value="2.1"/> + </application> +</manifest> diff --git a/res/layout/main_car.xml b/res/layout/main_car.xml new file mode 100644 index 0000000..1577ec4 --- /dev/null +++ b/res/layout/main_car.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2021 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. +--> + +<com.android.car.ui.FocusArea + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/main"/> + +</com.android.car.ui.FocusArea> diff --git a/src/com/android/htmlviewer/CarHTMLViewerActivity.java b/src/com/android/htmlviewer/CarHTMLViewerActivity.java new file mode 100644 index 0000000..de31bff --- /dev/null +++ b/src/com/android/htmlviewer/CarHTMLViewerActivity.java @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2021 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.htmlviewer; + +import android.webkit.WebView; + +import com.android.car.ui.core.CarUi; +import com.android.car.ui.toolbar.Toolbar; +import com.android.car.ui.toolbar.ToolbarController; + +/** + * An HTMLViewerActivity used for car builds. + */ +public class CarHTMLViewerActivity extends HTMLViewerActivity { + private ToolbarController mToolbar; + + @Override + protected void setContentView() { + setContentView(R.layout.main_car); + WebView webView = requireViewById(R.id.webview); + webView.setDefaultFocusHighlightEnabled(false); + mToolbar = CarUi.requireToolbar(this); + mToolbar.setState(Toolbar.State.SUBPAGE); + } + + @Override + public void setTitle(CharSequence title) { + super.setTitle(title); + mToolbar.setTitle(title); + } +} diff --git a/src/com/android/htmlviewer/HTMLViewerActivity.java b/src/com/android/htmlviewer/HTMLViewerActivity.java index 1aa1f68..233a87d 100644 --- a/src/com/android/htmlviewer/HTMLViewerActivity.java +++ b/src/com/android/htmlviewer/HTMLViewerActivity.java @@ -55,7 +55,7 @@ public class HTMLViewerActivity extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.main); + setContentView(); mWebView = findViewById(R.id.webview); mLoading = findViewById(R.id.loading); @@ -83,6 +83,10 @@ public class HTMLViewerActivity extends Activity { loadUrl(); } + protected void setContentView() { + setContentView(R.layout.main); + } + private void loadUrl() { if (mIntent.hasExtra(Intent.EXTRA_TITLE)) { setTitle(mIntent.getStringExtra(Intent.EXTRA_TITLE)); |