LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move from support appcompat to androidx appcompat

Browse Source 
Test: Manual
Change-Id: Id9af2504b557d3dd6a2d84786316497cff53d9a3
This commit is contained in:
Liam Clark
2018-11-15 16:00:42 -08:00
parent bd43fbe931
commit 53ee6bc2bf
15 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/IntentPlayground/Android.mk
View File

@@ -9,9 +9,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_STATIC_ANDROID_LIBRARIES := \ LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-v13 \ androidx.appcompat_appcompat
android-support-v7-appcompat \
android-support-v4 \
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true

2
samples/IntentPlayground/res/layout/activity_main.xml
View File

@@ -24,7 +24,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/app_bar" android:id="@+id/app_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/toolbarHeight" android:layout_height="@dimen/toolbarHeight"

2
samples/IntentPlayground/res/layout/fragment_result.xml
View File

@@ -25,7 +25,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/result_fragment_bar" android:id="@+id/result_fragment_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/toolbarHeight" android:layout_height="@dimen/toolbarHeight"

19
samples/IntentPlayground/src/com/example/android/intentplayground/BaseActivity.java
View File

@@ -16,13 +16,9 @@
package com.example.android.intentplayground; package com.example.android.intentplayground;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.content.Intent; import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.util.Log; import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
@@ -30,7 +26,10 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ScrollView; import android.widget.ScrollView;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import java.util.ArrayList; import java.util.ArrayList;
/** /**
@@ -53,7 +52,7 @@ public abstract class BaseActivity extends AppCompatActivity implements
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
if (BuildConfig.DEBUG) Log.d(getLocalClassName(), "onCreate()"); if (BuildConfig.DEBUG) Log.d(getLocalClassName(), "onCreate()");
// Setup action bar // Setup action bar
Toolbar appBar = (Toolbar) findViewById(R.id.app_bar); Toolbar appBar = findViewById(R.id.app_bar);
setSupportActionBar(appBar); setSupportActionBar(appBar);
loadMode(Mode.LAUNCH); loadMode(Mode.LAUNCH);
} }
@@ -73,8 +72,8 @@ public abstract class BaseActivity extends AppCompatActivity implements
*/ */
protected void loadMode(Mode mode) { protected void loadMode(Mode mode) {
Intent intent = getIntent(); Intent intent = getIntent();
ViewGroup container = (ViewGroup) findViewById(R.id.fragment_container); ViewGroup container = findViewById(R.id.fragment_container);
FragmentManager fragmentManager = getFragmentManager(); FragmentManager fragmentManager = getSupportFragmentManager();
FragmentTransaction transaction = fragmentManager.beginTransaction() FragmentTransaction transaction = fragmentManager.beginTransaction()
.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out); .setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out);
if (mode == Mode.LAUNCH) { if (mode == Mode.LAUNCH) {
@@ -144,8 +143,8 @@ public abstract class BaseActivity extends AppCompatActivity implements
* Creates and displays a help overlay on this activity. * Creates and displays a help overlay on this activity.
*/ */
protected void showHelpDialog() { protected void showHelpDialog() {
FragmentManager fragmentManager = getFragmentManager(); FragmentManager fragmentManager = getSupportFragmentManager();
LinearLayout container = (LinearLayout) findViewById(R.id.fragment_container); LinearLayout container = findViewById(R.id.fragment_container);
container.setShowDividers(LinearLayout.SHOW_DIVIDER_NONE); container.setShowDividers(LinearLayout.SHOW_DIVIDER_NONE);
ShowcaseFragment demo = new ShowcaseFragment(); ShowcaseFragment demo = new ShowcaseFragment();
demo.addStep(R.string.help_step_one, R.id.task_tree_container, () -> { demo.addStep(R.string.help_step_one, R.id.task_tree_container, () -> {

3
samples/IntentPlayground/src/com/example/android/intentplayground/ColorManager.java
View File

@@ -17,8 +17,7 @@
package com.example.android.intentplayground; package com.example.android.intentplayground;
import android.content.ComponentName; import android.content.ComponentName;
import android.support.annotation.ColorRes; import androidx.annotation.ColorRes;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

4
samples/IntentPlayground/src/com/example/android/intentplayground/CurrentTaskFragment.java
View File

@@ -20,16 +20,16 @@ import android.app.Activity;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ActivityManager.AppTask; import android.app.ActivityManager.AppTask;
import android.app.ActivityManager.RecentTaskInfo; import android.app.ActivityManager.RecentTaskInfo;
import android.app.Fragment;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;

10
samples/IntentPlayground/src/com/example/android/intentplayground/ExpandableAdapter.java
View File

@@ -15,8 +15,6 @@
*/ */
package com.example.android.intentplayground; package com.example.android.intentplayground;
import android.app.Activity;
import android.app.FragmentTransaction;
import android.content.Intent; import android.content.Intent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@@ -26,6 +24,8 @@ import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentTransaction;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@@ -34,7 +34,7 @@ import java.util.Locale;
* A two-level adapter for tasks and the activities that they hold (represented by Node). * A two-level adapter for tasks and the activities that they hold (represented by Node).
*/ */
class ExpandableAdapter extends BaseExpandableListAdapter { class ExpandableAdapter extends BaseExpandableListAdapter {
private Activity mActivity; private FragmentActivity mActivity;
private Node mTasks; private Node mTasks;
/** /**
@@ -42,7 +42,7 @@ class ExpandableAdapter extends BaseExpandableListAdapter {
* @param activity The activity that holds this adapter. * @param activity The activity that holds this adapter.
* @param tasks The {@link Node} root of the task hierarchy. * @param tasks The {@link Node} root of the task hierarchy.
*/ */
public ExpandableAdapter(Activity activity, Node tasks) { public ExpandableAdapter(FragmentActivity activity, Node tasks) {
mActivity = activity; mActivity = activity;
mTasks = tasks; mTasks = tasks;
} }
@@ -148,7 +148,7 @@ class ExpandableAdapter extends BaseExpandableListAdapter {
* @param flags The flags to list. * @param flags The flags to list.
*/ */
private void showDialogWithFlags(String shortClassName, List<String> flags) { private void showDialogWithFlags(String shortClassName, List<String> flags) {
FragmentTransaction transaction = mActivity.getFragmentManager().beginTransaction(); FragmentTransaction transaction = mActivity.getSupportFragmentManager().beginTransaction();
IntentDialogFragment.newInstance(shortClassName, flags).show(transaction, "intentDialog"); IntentDialogFragment.newInstance(shortClassName, flags).show(transaction, "intentDialog");
} }

2
samples/IntentPlayground/src/com/example/android/intentplayground/IntentBuilderView.java
View File

@@ -23,7 +23,6 @@ import android.content.pm.ActivityInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.support.annotation.NonNull;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -37,6 +36,7 @@ import android.widget.RadioGroup;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;

8
samples/IntentPlayground/src/com/example/android/intentplayground/IntentDialogFragment.java
View File

@@ -16,9 +16,9 @@
package com.example.android.intentplayground; package com.example.android.intentplayground;
import android.app.DialogFragment;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -28,6 +28,8 @@ import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.ScrollView; import android.widget.ScrollView;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -71,7 +73,7 @@ public class IntentDialogFragment extends DialogFragment {
LinearLayout rootLayout = (LinearLayout) inflater LinearLayout rootLayout = (LinearLayout) inflater
.inflate(R.layout.fragment_intent_dialog, container, false /* attachToRoot */); .inflate(R.layout.fragment_intent_dialog, container, false /* attachToRoot */);
ListView flagsListView = rootLayout.findViewById(R.id.flag_list); ListView flagsListView = rootLayout.findViewById(R.id.flag_list);
ArrayAdapter<String> adapter = new ArrayAdapter<String>(getActivity(), ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(),
R.layout.dialog_list_item, R.id.item, mFlags); R.layout.dialog_list_item, R.id.item, mFlags);
flagsListView.setAdapter(adapter); flagsListView.setAdapter(adapter);
rootLayout.findViewById(R.id.dialog_cancel).setOnClickListener(view -> { rootLayout.findViewById(R.id.dialog_cancel).setOnClickListener(view -> {

6
samples/IntentPlayground/src/com/example/android/intentplayground/IntentFragment.java
View File

@@ -17,17 +17,17 @@
package com.example.android.intentplayground; package com.example.android.intentplayground;
import android.app.Activity; import android.app.Activity;
import android.app.Fragment;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;

2
samples/IntentPlayground/src/com/example/android/intentplayground/Shims.java
View File

@@ -16,8 +16,8 @@
package com.example.android.intentplayground; package com.example.android.intentplayground;
import android.app.Fragment;
import android.view.View; import android.view.View;
import androidx.fragment.app.Fragment;
class BuildConfig { class BuildConfig {
static final boolean DEBUG = true; static final boolean DEBUG = true;

14
samples/IntentPlayground/src/com/example/android/intentplayground/ShowcaseFragment.java
View File

@@ -15,16 +15,10 @@
*/ */
package com.example.android.intentplayground; package com.example.android.intentplayground;
import android.app.Fragment;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.IdRes;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.support.v4.view.PagerTitleStrip;
import android.support.v4.view.ViewPager;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -33,6 +27,12 @@ import android.view.ViewGroup;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ScrollView; import android.widget.ScrollView;
import androidx.annotation.IdRes;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.fragment.app.Fragment;
import androidx.viewpager.widget.PagerTitleStrip;
import androidx.viewpager.widget.ViewPager;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@@ -169,7 +169,7 @@ public class ShowcaseFragment extends Fragment {
* Destroys this fragment. * Destroys this fragment.
*/ */
public void cancel() { public void cancel() {
getActivity().getFragmentManager().beginTransaction().remove(this).commit(); getActivity().getSupportFragmentManager().beginTransaction().remove(this).commit();
} }
private void clearHighlight() { private void clearHighlight() {

4
samples/IntentPlayground/src/com/example/android/intentplayground/StepAdapter.java
View File

@@ -16,14 +16,14 @@
package com.example.android.intentplayground; package com.example.android.intentplayground;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.support.v4.view.PagerAdapter;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import androidx.viewpager.widget.PagerAdapter;
import java.util.List; import java.util.List;
/** /**

1
samples/IntentPlayground/src/com/example/android/intentplayground/TestBase.java
View File

@@ -25,7 +25,6 @@ import android.content.Intent;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import com.example.android.intentplayground.TaskInfo.ActivityInstanceInfoMirror; import com.example.android.intentplayground.TaskInfo.ActivityInstanceInfoMirror;

2
samples/IntentPlayground/src/com/example/android/intentplayground/TreeFragment.java
View File

@@ -18,7 +18,6 @@ package com.example.android.intentplayground;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.Fragment;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@@ -26,6 +25,7 @@ import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.fragment.app.Fragment;
/** /**
* This fragment displays a hierarchy of tasks and activities in an expandable list. * This fragment displays a hierarchy of tasks and activities in an expandable list.