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

Commit 141883f1 authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by android-build-merger
Browse files

Merge "Remove usages of ActionBarActivity." into oc-dev 

am: 28d5e3ca

Change-Id: Ic4912b727886f3e9a24f6e4a88ab433b57c19057
parents ae06b1b3 28d5e3ca

java/com/android/dialer/about/LicenseActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
package com.android.dialer.about;



import android.os.Bundle;

import android.support.v7.app.ActionBarActivity;

import android.support.v7.app.AppCompatActivity;

import android.view.MenuItem;

import android.widget.ScrollView;

import android.widget.TextView;



/** Simple Activity that renders locally stored open source legal info in a text view. */

public final class LicenseActivity extends ActionBarActivity {

public final class LicenseActivity extends AppCompatActivity {

  private static final String TAG = "LicenseActivity";

  private static final String STATE_SCROLL_POS = "scroll_pos";

java/com/android/dialer/about/LicenseMenuActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.content.Intent; 
import android.os.Bundle;

import android.support.v4.app.LoaderManager.LoaderCallbacks;

import android.support.v4.content.Loader;

import android.support.v7.app.ActionBarActivity;

import android.support.v7.app.AppCompatActivity;

import android.view.MenuItem;

import android.view.View;

import android.widget.AdapterView;
@@ -31,7 +31,7 @@ import java.util.ArrayList; 
import java.util.List;



/** An Activity listing third party libraries with notice licenses. */

public final class LicenseMenuActivity extends ActionBarActivity

public final class LicenseMenuActivity extends AppCompatActivity

    implements LoaderCallbacks<List<License>> {



  static final String ARGS_LICENSE = "license";