diff options
author | Jackal Guo <jackalguo@google.com> | 2021-04-29 03:37:57 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-29 03:37:57 +0000 |
commit | 068c339411058931a79499101ecc56804069b107 (patch) | |
tree | 89f0a8633ccb6a4a6b832776d8f9f15504c1476e | |
parent | 4238f2a0fd02f66f1c1e8df7176f5e53fe2ef30f (diff) | |
parent | 6934fc55b2be18802dabc1a4e80affbcb27bc998 (diff) | |
download | HTMLViewer-068c339411058931a79499101ecc56804069b107.tar.gz |
Revert "Create CarHTMLViewer for car builds" am: 6934fc55b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/HTMLViewer/+/14328772
Change-Id: Icb234c3a46ac7c7defdd1b2e945554462260ad4e
-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, 1 insertions, 128 deletions
@@ -17,18 +17,6 @@ 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 deleted file mode 100644 index 2c737ea..0000000 --- a/AndroidManifest-car.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?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 deleted file mode 100644 index 1577ec4..0000000 --- a/res/layout/main_car.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?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 deleted file mode 100644 index de31bff..0000000 --- a/src/com/android/htmlviewer/CarHTMLViewerActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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 233a87d..1aa1f68 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(); + setContentView(R.layout.main); mWebView = findViewById(R.id.webview); mLoading = findViewById(R.id.loading); @@ -83,10 +83,6 @@ 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)); |