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

Commit 964993e9 authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by android-build-merger
Browse files

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

am: c742b8ab

Change-Id: Ie10c1ddf16fa238b2e2ee5b0c58b1cff3981433f
parents 169a884f c742b8ab

tests/MusicServiceDemo/src/com/example/android/musicservicedemo/MainActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ package com.example.android.musicservicedemo; 


import android.os.Bundle;

import android.support.v4.app.Fragment;

import android.support.v7.app.ActionBarActivity;

import android.support.v7.app.AppCompatActivity;

import android.view.LayoutInflater;

import android.view.Menu;

import android.view.MenuItem;
@@ -31,7 +31,7 @@ import com.example.android.musicservicedemo.R; 
/**

 * Main activity of the app.

 */

public class MainActivity extends ActionBarActivity {

public class MainActivity extends AppCompatActivity {



    private static final String LOG = "MainActivity";

tests/TouchLatency/app/src/main/java/com/prefabulated/touchlatency/TouchLatencyActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import android.graphics.Canvas; 
import android.graphics.Color;

import android.graphics.Paint;

import android.os.CountDownTimer;

import android.support.v7.app.ActionBarActivity;

import android.support.v7.app.AppCompatActivity;

import android.os.Bundle;

import android.text.method.Touch;

import android.util.AttributeSet;
@@ -173,7 +173,7 @@ class TouchLatencyView extends View implements View.OnTouchListener { 
    private float mVelocityX, mVelocityY;

}



public class TouchLatencyActivity extends ActionBarActivity {

public class TouchLatencyActivity extends AppCompatActivity {



    @Override

    protected void onCreate(Bundle savedInstanceState) {