Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca4e1332 authored by Wenyi Wang's avatar Wenyi Wang
Browse files

Make LicenseActivity app compat 

Theme of LicenseActivity is app compat now, so we need this change
to make it match its theme, so as to make toolbar show up.

Bug: 32981752

Test: manually verified toolbar shows up on NYC and LMP.

Change-Id: I57ef542051ede2697b0f206f6b59f556f6f57394
parent e6493181

src/com/android/contacts/common/activity/LicenseActivity.java

+4 −4
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ package com.android.contacts.common.activity; 


import com.android.contacts.common.R;



import android.app.ActionBar;

import android.app.Activity;

import android.support.v7.app.ActionBar;

import android.support.v7.app.AppCompatActivity;

import android.os.Bundle;

import android.view.MenuItem;

import android.webkit.WebView;
@@ -26,7 +26,7 @@ import android.webkit.WebView; 
/**

 * Displays the licenses for all open source libraries.

 */

public class LicenseActivity extends Activity {

public class LicenseActivity extends AppCompatActivity {

    private static final String LICENSE_FILE = "file:///android_asset/licenses.html";

    private WebView mWebView;
@@ -36,7 +36,7 @@ public class LicenseActivity extends Activity { 
        setContentView(R.layout.licenses);

        mWebView = (WebView) findViewById(R.id.webview);

        mWebView.loadUrl(LICENSE_FILE);

        final ActionBar actionBar = getActionBar();

        final ActionBar actionBar = getSupportActionBar();

        if (actionBar != null) {

            actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);

        }