diff options
author | Tai Kuo <taikuo@google.com> | 2020-07-30 18:35:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-30 18:35:37 +0000 |
commit | 179289e1afc894d69a5be33c892ed8213b0bd930 (patch) | |
tree | d5b0de5e400088d4e378c410d31797152932ca5d | |
parent | d8a51d2d875f2a1eb4e137dd993e167c0b1dab3a (diff) | |
parent | cc14c0e9e38fbc64ff83193d5f9c3d96b52dfa11 (diff) | |
download | walt-179289e1afc894d69a5be33c892ed8213b0bd930.tar.gz |
walt: app: migrate to AndroidX, AppCompat and new API am: 53e0953484 am: 4663815550 am: cc14c0e9e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/walt/+/11887677
Change-Id: Iac94c5df1933d1b26c02960e5fd7b6e860f2a663
34 files changed, 162 insertions, 127 deletions
diff --git a/android/WALT/app/build.gradle b/android/WALT/app/build.gradle index 71a473c..d3fd5ae 100644 --- a/android/WALT/app/build.gradle +++ b/android/WALT/app/build.gradle @@ -36,18 +36,19 @@ android { } dependencies { - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' - implementation 'com.android.support:preference-v7:27.1.1' - implementation 'com.android.support:preference-v14:27.1.1' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.1.0' + implementation 'androidx.preference:preference:1.1.1' + implementation 'androidx.legacy:legacy-preference-v14:1.0.0' implementation 'com.github.PhilJay:MPAndroidChart:v3.0.1' - testImplementation 'junit:junit:4.12' + implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' + testImplementation 'junit:junit:4.13' testImplementation 'org.mockito:mockito-core:1.10.19' - testImplementation ('org.powermock:powermock-api-mockito:1.6.2') { + testImplementation ('org.powermock:powermock-api-mockito:1.6.6') { exclude module: 'hamcrest-core' exclude module: 'objenesis' } - testImplementation ('org.powermock:powermock-module-junit4:1.6.2') { + testImplementation ('org.powermock:powermock-module-junit4:1.6.6') { exclude module: 'hamcrest-core' exclude module: 'objenesis' } diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/AboutFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/AboutFragment.java index 08b4e4f..31d7de2 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/AboutFragment.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/AboutFragment.java @@ -19,12 +19,13 @@ package org.chromium.latency.walt; import android.os.Build; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.fragment.app.Fragment; + /** * A screen that shows information about WALT. diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/AccelerometerFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/AccelerometerFragment.java index 3ed677c..77d7a92 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/AccelerometerFragment.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/AccelerometerFragment.java @@ -16,6 +16,12 @@ package org.chromium.latency.walt; +import static org.chromium.latency.walt.Utils.argmax; +import static org.chromium.latency.walt.Utils.interp; +import static org.chromium.latency.walt.Utils.max; +import static org.chromium.latency.walt.Utils.mean; +import static org.chromium.latency.walt.Utils.min; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -27,7 +33,6 @@ import android.hardware.SensorManager; import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; -import android.support.v4.app.Fragment; import android.text.method.ScrollingMovementMethod; import android.view.LayoutInflater; import android.view.View; @@ -35,6 +40,8 @@ import android.view.ViewGroup; import android.widget.TextView; import android.widget.Toast; +import androidx.fragment.app.Fragment; + import com.github.mikephil.charting.charts.ScatterChart; import com.github.mikephil.charting.components.Description; import com.github.mikephil.charting.data.Entry; @@ -45,12 +52,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import static org.chromium.latency.walt.Utils.argmax; -import static org.chromium.latency.walt.Utils.interp; -import static org.chromium.latency.walt.Utils.max; -import static org.chromium.latency.walt.Utils.mean; -import static org.chromium.latency.walt.Utils.min; - public class AccelerometerFragment extends Fragment implements View.OnClickListener, SensorEventListener { diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/AudioFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/AudioFragment.java index 65452ff..3db3723 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/AudioFragment.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/AudioFragment.java @@ -16,6 +16,8 @@ package org.chromium.latency.walt; +import static org.chromium.latency.walt.Utils.getIntPreference; + import android.Manifest; import android.content.BroadcastReceiver; import android.content.Context; @@ -24,8 +26,6 @@ import android.content.pm.PackageManager; import android.graphics.Color; import android.media.AudioManager; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; import android.text.method.ScrollingMovementMethod; import android.view.LayoutInflater; import android.view.View; @@ -34,6 +34,9 @@ import android.widget.ArrayAdapter; import android.widget.Spinner; import android.widget.TextView; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + import com.github.mikephil.charting.charts.LineChart; import com.github.mikephil.charting.components.Description; import com.github.mikephil.charting.components.LimitLine; @@ -45,8 +48,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import static org.chromium.latency.walt.Utils.getIntPreference; - /** * A simple {@link Fragment} subclass. */ diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/AutoRunFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/AutoRunFragment.java index f2f2a7f..71f5979 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/AutoRunFragment.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/AutoRunFragment.java @@ -21,14 +21,15 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; import android.text.method.ScrollingMovementMethod; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; + import java.io.FileWriter; import java.io.IOException; import java.util.Iterator; diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/BaseUsbConnection.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/BaseUsbConnection.java index f0e6c62..d206519 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/BaseUsbConnection.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/BaseUsbConnection.java @@ -24,7 +24,8 @@ import android.content.IntentFilter; import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbDeviceConnection; import android.hardware.usb.UsbManager; -import android.support.v4.content.LocalBroadcastManager; + +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import java.util.HashMap; import java.util.Locale; diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/CrashLogActivity.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/CrashLogActivity.java index 00e80ed..f2ce3d1 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/CrashLogActivity.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/CrashLogActivity.java @@ -17,10 +17,11 @@ package org.chromium.latency.walt; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.text.method.ScrollingMovementMethod; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; + /** * A separate activity to display exception trace on the screen in case of a crash. diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/DiagnosticsFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/DiagnosticsFragment.java index 65ec3bf..17b0f2f 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/DiagnosticsFragment.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/DiagnosticsFragment.java @@ -21,13 +21,14 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.text.method.ScrollingMovementMethod; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.fragment.app.Fragment; + /** * This screen allows to perform different tasks useful for diagnostics. diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/DragLatencyFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/DragLatencyFragment.java index af03e36..f74cf56 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/DragLatencyFragment.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/DragLatencyFragment.java @@ -21,7 +21,6 @@ import android.content.Context; import android.content.Intent; import android.graphics.Color; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.text.method.ScrollingMovementMethod; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -29,6 +28,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.fragment.app.Fragment; + import com.github.mikephil.charting.charts.ScatterChart; import com.github.mikephil.charting.components.Description; import com.github.mikephil.charting.data.Entry; diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/FastPathSurfaceView.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/FastPathSurfaceView.java index 449627f..0c5ad59 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/FastPathSurfaceView.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/FastPathSurfaceView.java @@ -22,13 +22,14 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.Rect; import android.os.Build; -import android.support.annotation.RequiresApi; import android.util.AttributeSet; import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; import android.widget.Toast; +import androidx.annotation.RequiresApi; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/FrontPageFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/FrontPageFragment.java index cb125e3..84fbbbe 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/FrontPageFragment.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/FrontPageFragment.java @@ -18,13 +18,14 @@ package org.chromium.latency.walt; import android.graphics.Color; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.fragment.app.Fragment; + /** * A simple {@link Fragment} subclass. diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/LogFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/LogFragment.java index 069d032..1e26b32 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/LogFragment.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/LogFragment.java @@ -17,25 +17,26 @@ package org.chromium.latency.walt; -import android.app.Activity; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.text.method.ScrollingMovementMethod; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; + /** * A screen that shows the log. */ public class LogFragment extends Fragment { - private Activity activity; + private AppCompatActivity activity; private SimpleLogger logger; TextView textView; @@ -56,7 +57,7 @@ public class LogFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - activity = getActivity(); + activity = (AppCompatActivity) getActivity(); logger = SimpleLogger.getInstance(getContext()); // Inflate the layout for this fragment return inflater.inflate(R.layout.fragment_log, container, false); diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/LogUploader.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/LogUploader.java index a73f456..aa10f74 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/LogUploader.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/LogUploader.java @@ -17,7 +17,8 @@ package org.chromium.latency.walt; import android.content.Context; -import android.support.v4.content.AsyncTaskLoader; + +import androidx.loader.content.AsyncTaskLoader; import java.io.BufferedOutputStream; import java.io.IOException; diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/MainActivity.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/MainActivity.java index e0d0d75..6b36d97 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/MainActivity.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/MainActivity.java @@ -16,6 +16,8 @@ package org.chromium.latency.walt; +import static org.chromium.latency.walt.Utils.getBooleanPreference; + import android.Manifest; import android.content.DialogInterface; import android.content.Intent; @@ -30,18 +32,6 @@ import android.os.Bundle; import android.os.Environment; import android.os.Handler; import android.os.StrictMode; -import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.Loader; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -49,7 +39,18 @@ import android.view.View; import android.widget.EditText; import android.widget.Toast; -import org.chromium.latency.walt.programmer.Programmer; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.loader.content.Loader; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.preference.PreferenceManager; import java.io.File; import java.io.FileOutputStream; @@ -59,7 +60,7 @@ import java.io.StringWriter; import java.util.Date; import java.util.Locale; -import static org.chromium.latency.walt.Utils.getBooleanPreference; +import org.chromium.latency.walt.programmer.Programmer; public class MainActivity extends AppCompatActivity { private static final String TAG = "WALT"; @@ -492,7 +493,7 @@ public class MainActivity extends AppCompatActivity { // A reasonable world readable location,on many phones it's /storage/emulated/Documents // TODO: make this location configurable? - File path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS); + File path = getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS); File file = null; FileOutputStream outStream = null; @@ -516,7 +517,7 @@ public class MainActivity extends AppCompatActivity { } public void clearLogFile() { - File path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS); + File path = getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS); try { File file = new File(path, LOG_FILENAME); file.delete(); diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/MidiFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/MidiFragment.java index c6f1118..8d3fe6a 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/MidiFragment.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/MidiFragment.java @@ -20,13 +20,14 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.text.method.ScrollingMovementMethod; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.fragment.app.Fragment; + import java.util.Locale; public class MidiFragment extends Fragment diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/NumberPickerPreference.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/NumberPickerPreference.java index 9d71d42..cf4ef55 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/NumberPickerPreference.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/NumberPickerPreference.java @@ -19,13 +19,15 @@ package org.chromium.latency.walt; import android.content.Context; import android.content.res.TypedArray; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.preference.DialogPreference; -import android.support.v7.preference.PreferenceDialogFragmentCompat; import android.util.AttributeSet; import android.view.View; +import androidx.annotation.NonNull; +import androidx.preference.DialogPreference; +import androidx.preference.PreferenceDialogFragmentCompat; + public class NumberPickerPreference extends DialogPreference { + private boolean isInitSet = false; private int currentValue; private int maxValue; private int minValue; @@ -62,9 +64,13 @@ public class NumberPickerPreference extends DialogPreference { } public void setValue(int value) { - currentValue = value; - persistInt(currentValue); - setSummary(String.format(defaultSummary, getValue())); + boolean changed = (currentValue != value); + if (changed || !isInitSet) { + isInitSet = true; + currentValue = value; + persistInt(currentValue); + setSummary(String.format(defaultSummary, getValue())); + } } @Override @@ -73,8 +79,8 @@ public class NumberPickerPreference extends DialogPreference { } @Override - protected void onSetInitialValue(boolean restorePersistedValue, Object defaultValue) { - setValue(restorePersistedValue ? getPersistedInt(currentValue) : (Integer) defaultValue); + protected void onSetInitialValue(Object defaultValue) { + setValue((Integer) defaultValue); } public static class NumberPickerPreferenceDialogFragmentCompat diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/ScreenResponseFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/ScreenResponseFragment.java index 629ed7d..d1ebfac 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/ScreenResponseFragment.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/ScreenResponseFragment.java @@ -16,16 +16,15 @@ package org.chromium.latency.walt; +import static org.chromium.latency.walt.Utils.getBooleanPreference; +import static org.chromium.latency.walt.Utils.getIntPreference; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.graphics.Color; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; import android.text.method.ScrollingMovementMethod; import android.view.Choreographer; import android.view.LayoutInflater; @@ -36,6 +35,11 @@ import android.widget.ArrayAdapter; import android.widget.Spinner; import android.widget.TextView; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; + import com.github.mikephil.charting.charts.LineChart; import com.github.mikephil.charting.components.Description; import com.github.mikephil.charting.data.Entry; @@ -47,9 +51,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import static org.chromium.latency.walt.Utils.getBooleanPreference; -import static org.chromium.latency.walt.Utils.getIntPreference; - /** * Measurement of screen response time when switching between black and white. */ diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/SettingsFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/SettingsFragment.java index 4f74fc4..ace30cc 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/SettingsFragment.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/SettingsFragment.java @@ -18,19 +18,21 @@ package org.chromium.latency.walt; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.content.ContextCompat; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceFragmentCompat; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.widget.Toolbar; import android.view.View; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; -public class SettingsFragment extends PreferenceFragmentCompat implements PreferenceFragmentCompat.OnPreferenceStartScreenCallback { + +public class SettingsFragment extends PreferenceFragmentCompat implements + PreferenceFragmentCompat.OnPreferenceStartScreenCallback { private Toolbar toolbar; @@ -70,8 +72,8 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Prefer DialogFragment fragment = NumberPickerPreference. NumberPickerPreferenceDialogFragmentCompat.newInstance(preference.getKey()); fragment.setTargetFragment(this, 0); - fragment.show(getFragmentManager(), - "android.support.v7.preference.PreferenceFragment.DIALOG"); + fragment.show(getParentFragmentManager(), + "androidx.preference.PreferenceFragment.DIALOG"); } else { super.onDisplayPreferenceDialog(preference); } @@ -90,7 +92,8 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Prefer args.putString(PreferenceFragmentCompat.ARG_PREFERENCE_ROOT, preferenceScreen.getKey()); fragment.setArguments(args); - FragmentTransaction ft = preferenceFragmentCompat.getFragmentManager().beginTransaction(); + FragmentTransaction ft = preferenceFragmentCompat. + getParentFragmentManager().beginTransaction(); ft.add(R.id.fragment_container, fragment, preferenceScreen.getKey()); ft.addToBackStack(preferenceScreen.getTitle().toString()); ft.commit(); diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/SimpleLogger.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/SimpleLogger.java index 6059e0f..9244377 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/SimpleLogger.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/SimpleLogger.java @@ -20,7 +20,9 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.support.v4.content.LocalBroadcastManager; + +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import android.util.Log; /** diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/TapLatencyFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/TapLatencyFragment.java index e26a328..e47620e 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/TapLatencyFragment.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/TapLatencyFragment.java @@ -20,7 +20,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.text.method.ScrollingMovementMethod; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -29,6 +28,8 @@ import android.view.ViewGroup; import android.widget.ImageButton; import android.widget.TextView; +import androidx.fragment.app.Fragment; + import java.io.IOException; import java.util.ArrayList; import java.util.Locale; diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/UsMotionEvent.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/UsMotionEvent.java index e961949..92f856b 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/UsMotionEvent.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/UsMotionEvent.java @@ -119,7 +119,7 @@ public class UsMotionEvent { private long getEventTimeMicro(MotionEvent event) { long t_nanos = -1; try { - Class cls = Class.forName("android.view.MotionEvent"); + Class<?> cls = Class.forName("android.view.MotionEvent"); Method myTimeGetter = cls.getMethod("getEventTimeNano"); t_nanos = (long) myTimeGetter.invoke(event); } catch (Exception e) { @@ -132,7 +132,7 @@ public class UsMotionEvent { private long getHistoricalEventTimeMicro(MotionEvent event, int pos) { long t_nanos = -1; try { - Class cls = Class.forName("android.view.MotionEvent"); + Class<?> cls = Class.forName("android.view.MotionEvent"); Method myTimeGetter = cls.getMethod("getHistoricalEventTimeNano", new Class[] {int.class}); t_nanos = (long) myTimeGetter.invoke(event, new Object[]{pos}); } catch (Exception e) { diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/Utils.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/Utils.java index 97738ce..46796e2 100644 --- a/android/WALT/app/src/main/java/org/chromium/latency/walt/Utils.java +++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/Utils.java @@ -18,8 +18,9 @@ package org.chromium.latency.walt; import android.content.Context; import android.content.SharedPreferences; -import android.preference.PreferenceManager; -import android.support.annotation.StringRes; + +import androidx.preference.PreferenceManager; +import androidx.annotation.StringRes; import com.github.mikephil.charting.data.Entry; diff --git a/android/WALT/app/src/main/res/layout/fragment_accelerometer.xml b/android/WALT/app/src/main/res/layout/fragment_accelerometer.xml index 664e246..887fd6c 100644 --- a/android/WALT/app/src/main/res/layout/fragment_accelerometer.xml +++ b/android/WALT/app/src/main/res/layout/fragment_accelerometer.xml @@ -1,4 +1,5 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" @@ -23,7 +24,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:tint="@color/button_tint" - android:src="@drawable/ic_play_arrow_black_24dp" /> + app:srcCompat="@drawable/ic_play_arrow_black_24dp" /> </LinearLayout> diff --git a/android/WALT/app/src/main/res/layout/fragment_audio.xml b/android/WALT/app/src/main/res/layout/fragment_audio.xml index e11f157..de2bdbb 100644 --- a/android/WALT/app/src/main/res/layout/fragment_audio.xml +++ b/android/WALT/app/src/main/res/layout/fragment_audio.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:tint="@color/button_tint" - android:src="@drawable/ic_stop_black_24dp" /> + walt:srcCompat="@drawable/ic_stop_black_24dp" /> <ImageButton android:id="@+id/button_start_audio" @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:tint="@color/button_tint" - android:src="@drawable/ic_play_arrow_black_24dp" /> + walt:srcCompat="@drawable/ic_play_arrow_black_24dp" /> <Spinner android:id="@+id/spinner_audio_mode" diff --git a/android/WALT/app/src/main/res/layout/fragment_diagnostics.xml b/android/WALT/app/src/main/res/layout/fragment_diagnostics.xml index 82a3cae..262f616 100644 --- a/android/WALT/app/src/main/res/layout/fragment_diagnostics.xml +++ b/android/WALT/app/src/main/res/layout/fragment_diagnostics.xml @@ -1,4 +1,5 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" @@ -23,7 +24,7 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_usb_black_24dp" /> + app:srcCompat="@drawable/ic_usb_black_24dp" /> <LinearLayout android:layout_width="match_parent" @@ -54,7 +55,7 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_swap_horiz_black_24dp" /> + app:srcCompat="@drawable/ic_swap_horiz_black_24dp" /> <LinearLayout android:layout_width="match_parent" @@ -84,7 +85,7 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_schedule_black_24dp" /> + app:srcCompat="@drawable/ic_schedule_black_24dp" /> <LinearLayout android:layout_width="match_parent" @@ -109,7 +110,7 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_timelapse_black_24dp" /> + app:srcCompat="@drawable/ic_timelapse_black_24dp" /> <LinearLayout android:layout_width="match_parent" @@ -139,7 +140,7 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_system_update_alt_black_24dp" /> + app:srcCompat="@drawable/ic_system_update_alt_black_24dp" /> <LinearLayout android:layout_width="match_parent" diff --git a/android/WALT/app/src/main/res/layout/fragment_drag_latency.xml b/android/WALT/app/src/main/res/layout/fragment_drag_latency.xml index f9b65d0..9e77ff9 100644 --- a/android/WALT/app/src/main/res/layout/fragment_drag_latency.xml +++ b/android/WALT/app/src/main/res/layout/fragment_drag_latency.xml @@ -1,4 +1,5 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" @@ -19,21 +20,21 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:tint="@color/button_tint" - android:src="@drawable/ic_refresh_black_24dp" /> + app:srcCompat="@drawable/ic_refresh_black_24dp" /> <ImageButton android:id="@+id/button_start_drag" android:layout_width="wrap_content" android:layout_height="wrap_content" android:tint="@color/button_tint" - android:src="@drawable/ic_play_arrow_black_24dp" /> + app:srcCompat="@drawable/ic_play_arrow_black_24dp" /> <ImageButton android:id="@+id/button_finish_drag" android:layout_width="wrap_content" android:layout_height="wrap_content" android:tint="@color/button_tint" - android:src="@drawable/ic_check_black_24dp" /> + app:srcCompat="@drawable/ic_check_black_24dp" /> </LinearLayout> <FrameLayout diff --git a/android/WALT/app/src/main/res/layout/fragment_front_page.xml b/android/WALT/app/src/main/res/layout/fragment_front_page.xml index c4fba96..a0bd5d3 100644 --- a/android/WALT/app/src/main/res/layout/fragment_front_page.xml +++ b/android/WALT/app/src/main/res/layout/fragment_front_page.xml @@ -1,4 +1,5 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="fill_parent" @@ -16,7 +17,7 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_search_black_24dp" /> + app:srcCompat="@drawable/ic_search_black_24dp" /> <LinearLayout android:layout_width="match_parent" @@ -47,7 +48,7 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_radio_button_checked_black_24dp" /> + app:srcCompat="@drawable/ic_radio_button_checked_black_24dp" /> <LinearLayout android:layout_width="match_parent" @@ -72,7 +73,7 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_swap_vert_black_24dp" /> + app:srcCompat="@drawable/ic_swap_vert_black_24dp" /> <LinearLayout android:layout_width="match_parent" @@ -97,7 +98,7 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_brightness_medium_black_24dp" /> + app:srcCompat="@drawable/ic_brightness_medium_black_24dp" /> <LinearLayout android:layout_width="match_parent" @@ -122,7 +123,7 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_volume_up_black_24dp" /> + app:srcCompat="@drawable/ic_volume_up_black_24dp" /> <LinearLayout android:layout_width="match_parent" @@ -149,7 +150,7 @@ android:id="@+id/midi_image" style="@style/MenuIconStyle" android:tint="@color/ColorDisabled" - android:src="@drawable/ic_music_note_black_24dp" /> + app:srcCompat="@drawable/ic_music_note_black_24dp" /> <LinearLayout android:layout_width="match_parent" @@ -176,7 +177,7 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_receipt_black_24dp" /> + app:srcCompat="@drawable/ic_receipt_black_24dp" /> <LinearLayout android:layout_width="match_parent" @@ -201,7 +202,7 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_swap_horiz_black_24dp" /> + app:srcCompat="@drawable/ic_swap_horiz_black_24dp" /> <LinearLayout android:layout_width="match_parent" @@ -226,7 +227,7 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_settings_black_24dp" /> + app:srcCompat="@drawable/ic_settings_black_24dp" /> <LinearLayout android:layout_width="match_parent" @@ -252,7 +253,7 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_help_outline_black_24dp" /> + app:srcCompat="@drawable/ic_help_outline_black_24dp" /> <LinearLayout android:layout_width="match_parent" diff --git a/android/WALT/app/src/main/res/layout/fragment_midi.xml b/android/WALT/app/src/main/res/layout/fragment_midi.xml index 70f9be5..93beb58 100644 --- a/android/WALT/app/src/main/res/layout/fragment_midi.xml +++ b/android/WALT/app/src/main/res/layout/fragment_midi.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:layout_alignParentStart="true" android:tint="@color/button_tint" - android:src="@drawable/ic_input_black_24dp" /> + walt:srcCompat="@drawable/ic_input_black_24dp" /> <ImageButton android:id="@+id/button_start_midi_out" @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:tint="@color/button_tint" - android:src="@drawable/ic_output_black_24dp" /> + walt:srcCompat="@drawable/ic_output_black_24dp" /> </RelativeLayout> <org.chromium.latency.walt.HistogramChart diff --git a/android/WALT/app/src/main/res/layout/fragment_screen_response.xml b/android/WALT/app/src/main/res/layout/fragment_screen_response.xml index b789579..fae3eee 100644 --- a/android/WALT/app/src/main/res/layout/fragment_screen_response.xml +++ b/android/WALT/app/src/main/res/layout/fragment_screen_response.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:tint="@color/button_tint" - android:src="@drawable/ic_stop_black_24dp" /> + walt:srcCompat="@drawable/ic_stop_black_24dp" /> <ImageButton android:id="@+id/button_start_screen_response" @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:tint="@color/button_tint" - android:src="@drawable/ic_play_arrow_black_24dp" /> + walt:srcCompat="@drawable/ic_play_arrow_black_24dp" /> <Spinner android:id="@+id/spinner_screen_response" diff --git a/android/WALT/app/src/main/res/layout/fragment_tap_latency.xml b/android/WALT/app/src/main/res/layout/fragment_tap_latency.xml index 2c701d2..ab2ff51 100644 --- a/android/WALT/app/src/main/res/layout/fragment_tap_latency.xml +++ b/android/WALT/app/src/main/res/layout/fragment_tap_latency.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:tint="@color/button_tint" - android:src="@drawable/ic_check_black_24dp" /> + walt:srcCompat="@drawable/ic_check_black_24dp" /> <ImageButton android:id="@+id/button_restart_tap" @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:tint="@color/button_tint" - android:src="@drawable/ic_play_arrow_black_24dp" /> + walt:srcCompat="@drawable/ic_play_arrow_black_24dp" /> </RelativeLayout> <FrameLayout diff --git a/android/WALT/app/src/main/res/layout/toolbar.xml b/android/WALT/app/src/main/res/layout/toolbar.xml index d02028d..ef6aea8 100644 --- a/android/WALT/app/src/main/res/layout/toolbar.xml +++ b/android/WALT/app/src/main/res/layout/toolbar.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/ColorPrimary" android:elevation="4dp"> -</android.support.v7.widget.Toolbar>
\ No newline at end of file +</androidx.appcompat.widget.Toolbar>
\ No newline at end of file diff --git a/android/WALT/app/src/main/res/values/styles.xml b/android/WALT/app/src/main/res/values/styles.xml index 02095e7..ac4619e 100644 --- a/android/WALT/app/src/main/res/values/styles.xml +++ b/android/WALT/app/src/main/res/values/styles.xml @@ -6,7 +6,7 @@ <item name="colorPrimaryDark">@color/ColorPrimaryDark</item> <item name="colorAccent">@color/ColorAccent</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> - <item name="android:imageButtonStyle">@style/ImageButtonStyle</item> + <item name="imageButtonStyle">@style/ImageButtonStyle</item> <item name="imageButtonStyle">@style/ImageButtonStyle</item> <!-- the homeAsUpIndicator doesn't work with either png or xml icons --> <!--<item name="android:homeAsUpIndicator">@drawable/ic_chevron_left_black_24dp</item> --> @@ -16,7 +16,7 @@ <style name="MenuDivider"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">1dp</item> - <item name="android:background">?android:attr/listDivider</item> + <item name="background">?android:attr/listDivider</item> <item name="android:layout_marginLeft">72dp</item> </style> diff --git a/android/WALT/app/src/main/res/xml/preferences.xml b/android/WALT/app/src/main/res/xml/preferences.xml index 612c089..58a64f6 100644 --- a/android/WALT/app/src/main/res/xml/preferences.xml +++ b/android/WALT/app/src/main/res/xml/preferences.xml @@ -1,7 +1,7 @@ -<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:walt="http://schemas.android.com/apk/res-auto"> - <android.support.v7.preference.PreferenceScreen + <androidx.preference.PreferenceScreen android:key="pref_general_screen" android:persistent="false" android:title="General"> @@ -28,9 +28,9 @@ </PreferenceCategory> - </android.support.v7.preference.PreferenceScreen> + </androidx.preference.PreferenceScreen> - <android.support.v7.preference.PreferenceScreen + <androidx.preference.PreferenceScreen android:key="pref_tap_screen" android:persistent="false" android:title="Tap latency"> @@ -40,9 +40,9 @@ android:title="Show live histogram for tap test" android:defaultValue="true" /> - </android.support.v7.preference.PreferenceScreen> + </androidx.preference.PreferenceScreen> - <android.support.v7.preference.PreferenceScreen + <androidx.preference.PreferenceScreen android:key="pref_screen_response_screen" android:persistent="false" android:title="Screen response"> @@ -71,9 +71,9 @@ android:title="Test in fullscreen mode" android:defaultValue="true" /> - </android.support.v7.preference.PreferenceScreen> + </androidx.preference.PreferenceScreen> - <android.support.v7.preference.PreferenceScreen + <androidx.preference.PreferenceScreen android:key="pref_audio_screen" android:persistent="false" android:title="Audio"> @@ -105,9 +105,9 @@ walt:maxValue="100000" walt:minValue="1" /> - </android.support.v7.preference.PreferenceScreen> + </androidx.preference.PreferenceScreen> - <android.support.v7.preference.PreferenceScreen + <androidx.preference.PreferenceScreen android:key="pref_midi_screen" android:persistent="false" android:title="MIDI"> @@ -130,6 +130,6 @@ walt:maxValue="1000" walt:minValue="1" /> - </android.support.v7.preference.PreferenceScreen> + </androidx.preference.PreferenceScreen> -</android.support.v7.preference.PreferenceScreen> +</androidx.preference.PreferenceScreen> diff --git a/android/WALT/gradle.properties b/android/WALT/gradle.properties index 1d3591c..915f0e6 100644 --- a/android/WALT/gradle.properties +++ b/android/WALT/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true
\ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true
\ No newline at end of file |