diff options
author | Jackal Guo <jackalguo@google.com> | 2021-04-29 01:28:05 +0000 |
---|---|---|
committer | Jackal Guo <jackalguo@google.com> | 2021-04-29 01:28:05 +0000 |
commit | 6934fc55b2be18802dabc1a4e80affbcb27bc998 (patch) | |
tree | 89f0a8633ccb6a4a6b832776d8f9f15504c1476e /src/com/android/htmlviewer/CarHTMLViewerActivity.java | |
parent | e6399e23ae2df7bad50089de599635fe1bec62e6 (diff) | |
download | HTMLViewer-6934fc55b2be18802dabc1a4e80affbcb27bc998.tar.gz |
Revert "Create CarHTMLViewer for car builds"
Revert "Add HtmlViewer overlay"
Revert submission 14276507-HTML185951366
Reason for revert: DroidMonitor: Potential culprit for Bug 186698300 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted Changes:
I855cbcc77:Add CarHTMLViewer into the build file
Ie700b513d:Create CarHTMLViewer for car builds
I957d1b488:Add HtmlViewer overlay
Change-Id: I4ae7540473aa7f6e45fdfbf51e4e444f9aad3217
Diffstat (limited to 'src/com/android/htmlviewer/CarHTMLViewerActivity.java')
-rw-r--r-- | src/com/android/htmlviewer/CarHTMLViewerActivity.java | 45 |
1 files changed, 0 insertions, 45 deletions
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); - } -} |