Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: c742b8ab2d

Change-Id: Ie10c1ddf16fa238b2e2ee5b0c58b1cff3981433f
This commit is contained in:
Aurimas Liutikas
2017-06-06 21:29:29 +00:00
committed by android-build-merger
parent 169a884f81 c742b8ab2d
commit 964993e9aa
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/MusicServiceDemo/src/com/example/android/musicservicedemo/MainActivity.java
View File

@@ -17,7 +17,7 @@ package com.example.android.musicservicedemo;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; 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.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
@@ -31,7 +31,7 @@ import com.example.android.musicservicedemo.R;
/** /**
* Main activity of the app. * Main activity of the app.
*/ */
public class MainActivity extends ActionBarActivity { public class MainActivity extends AppCompatActivity {
private static final String LOG = "MainActivity"; private static final String LOG = "MainActivity";

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

@@ -21,7 +21,7 @@ import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint; import android.graphics.Paint;
import android.os.CountDownTimer; import android.os.CountDownTimer;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.text.method.Touch; import android.text.method.Touch;
import android.util.AttributeSet; import android.util.AttributeSet;
@@ -173,7 +173,7 @@ class TouchLatencyView extends View implements View.OnTouchListener {
private float mVelocityX, mVelocityY; private float mVelocityX, mVelocityY;
} }
public class TouchLatencyActivity extends ActionBarActivity { public class TouchLatencyActivity extends AppCompatActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {