AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Migrate compat v4 classes to androidx"

Browse Source 
This reverts commit dec95f24e1.

Reason for revert: broke viewer build

The original CL was landed to keep upstream Skia the source of
truth when the changes were proposed directly in G3 in cl/414839941.

Original change's description:
> Migrate compat v4 classes to androidx
>
> Change-Id: I9dd1d4cbaaf0dc5c4dc8a7bd9155ae6334ab24af
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/480396
> Reviewed-by: Derek Sollenberger <djsollen@google.com>
> Commit-Queue: Ben Wagner <bungeman@google.com>

Change-Id: I660ba61a3a777e18154c52e8eda63937be4d7b4a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/507184
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Florin Malita <fmalita@google.com>
This commit is contained in:
Florin Malita 2022-02-10 19:39:38 +00:00 committed by SkCQ
parent 74ce095463
commit 82d65d0487
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerActivity.java
View File

@ -10,6 +10,7 @@ package org.skia.viewer;
import android.app.Activity;
import android.content.res.Configuration;
import android.os.Bundle;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
import android.view.KeyEvent;
import android.view.Menu;
@ -21,7 +22,6 @@ import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.view.View;
import android.widget.ListView;
import androidx.core.widget.DrawerLayout;
public class ViewerActivity
extends Activity implements SurfaceHolder.Callback, View.OnTouchListener {

4
platform_tools/android/apps/viewer/src/main/res/layout/activity_main.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.DrawerLayout
<android.support.v4.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drawerLayout"
android:layout_width="match_parent"
@ -34,5 +34,5 @@
android:divider="@android:color/transparent"
android:dividerHeight="0dp"
android:background="@android:color/background_light"/>
</androidx.core.widget.DrawerLayout>
</android.support.v4.widget.DrawerLayout>