Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(590)

Side by Side Diff: remoting/android/java/src/org/chromium/chromoting/help/CreditsActivity.java

Issue 2769813003: [remoting android] Fix WebView deprecation warnings (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | remoting/android/java/src/org/chromium/chromoting/help/HelpActivity.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chromoting.help; 5 package org.chromium.chromoting.help;
6 6
7 import android.annotation.TargetApi;
7 import android.net.Uri; 8 import android.net.Uri;
9 import android.os.Build;
8 import android.os.Bundle; 10 import android.os.Bundle;
9 import android.support.v7.app.AppCompatActivity; 11 import android.support.v7.app.AppCompatActivity;
10 import android.support.v7.widget.Toolbar; 12 import android.support.v7.widget.Toolbar;
11 import android.view.MenuItem; 13 import android.view.MenuItem;
14 import android.webkit.WebResourceRequest;
12 import android.webkit.WebView; 15 import android.webkit.WebView;
13 import android.webkit.WebViewClient; 16 import android.webkit.WebViewClient;
14 17
15 import org.chromium.chromoting.ChromotingUtil; 18 import org.chromium.chromoting.ChromotingUtil;
16 import org.chromium.chromoting.R; 19 import org.chromium.chromoting.R;
17 20
18 /** 21 /**
19 * The Activity for showing the Credits screen. 22 * The Activity for showing the Credits screen.
20 */ 23 */
21 public class CreditsActivity extends AppCompatActivity { 24 public class CreditsActivity extends AppCompatActivity {
22 private static final String CREDITS_URL = "file:///android_res/raw/credits.h tml"; 25 private static final String CREDITS_URL = "file:///android_res/raw/credits.h tml";
23 26
24 @Override 27 @Override
25 public void onCreate(Bundle savedInstanceState) { 28 public void onCreate(Bundle savedInstanceState) {
26 super.onCreate(savedInstanceState); 29 super.onCreate(savedInstanceState);
27 30
28 setContentView(R.layout.credits); 31 setContentView(R.layout.credits);
29 WebView webView = (WebView) findViewById(R.id.web_view); 32 WebView webView = (WebView) findViewById(R.id.web_view);
30 33
31 Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); 34 Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
32 setSupportActionBar(toolbar); 35 setSupportActionBar(toolbar);
33 36
34 getSupportActionBar().setDisplayHomeAsUpEnabled(true); 37 getSupportActionBar().setDisplayHomeAsUpEnabled(true);
35 getSupportActionBar().setTitle(getString(R.string.actionbar_help_title)) ; 38 getSupportActionBar().setTitle(getString(R.string.actionbar_help_title)) ;
36 39
37 webView.getSettings().setJavaScriptEnabled(true); 40 webView.getSettings().setJavaScriptEnabled(true);
38 webView.setWebViewClient(new WebViewClient() { 41 webView.setWebViewClient(new WebViewClient() {
42 private boolean shouldOverrideUrlLoading(final Uri uri) {
43 // There are no internal links in the Credits page, so open any links in a
44 // Web browser.
45 ChromotingUtil.openUrl(CreditsActivity.this, uri);
46 return true;
47 }
48
49 @TargetApi(Build.VERSION_CODES.N)
50 @Override
51 public boolean shouldOverrideUrlLoading(WebView view, WebResourceReq uest request) {
52 return shouldOverrideUrlLoading(request.getUrl());
53 }
54
55 @SuppressWarnings("deprecation")
39 @Override 56 @Override
40 public boolean shouldOverrideUrlLoading(WebView view, String url) { 57 public boolean shouldOverrideUrlLoading(WebView view, String url) {
41 // There are no internal links in the Credits page, so open any links in a 58 return shouldOverrideUrlLoading(Uri.parse(url));
42 // Web browser.
43 ChromotingUtil.openUrl(CreditsActivity.this, Uri.parse(url));
44 return true;
45 } 59 }
46 }); 60 });
47 webView.loadUrl(CREDITS_URL); 61 webView.loadUrl(CREDITS_URL);
48 } 62 }
49 63
50 @Override 64 @Override
51 public boolean onOptionsItemSelected(MenuItem item) { 65 public boolean onOptionsItemSelected(MenuItem item) {
52 int id = item.getItemId(); 66 int id = item.getItemId();
53 if (id == android.R.id.home) { 67 if (id == android.R.id.home) {
54 finish(); 68 finish();
55 return true; 69 return true;
56 } 70 }
57 return super.onOptionsItemSelected(item); 71 return super.onOptionsItemSelected(item);
58 } 72 }
59 } 73 }
OLDNEW
« no previous file with comments | « no previous file | remoting/android/java/src/org/chromium/chromoting/help/HelpActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698