Traceur: Increase minSdk, remove QuickSettings code for old versions.
Traceur isn't going to be used on pre-N devices at this point. This
change removes the version compatibility code for Quick Settings support
and increases the minSdk to 23 (M).
Bug: 71862209
Test: Tested Traceur functionality through the app and using the QS
setting on a tip of tree Android build.
Change-Id: I5f5e91d34dfd07f6a3a9cf700ebee51f25ada492
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b96afb9..5169711 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,7 +20,7 @@
android:sharedUserId="android.uid.shell"
android:versionCode="2"
android:versionName="1.0">
- <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="23"/>
+ <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
diff --git a/res/values/preference_keys.xml b/res/values/preference_keys.xml
index 6c37b5e..9fc16de 100644
--- a/res/values/preference_keys.xml
+++ b/res/values/preference_keys.xml
@@ -2,6 +2,5 @@
<resources>
<string name="pref_key_tracing_on">tracing_on</string>
- <string name="pref_key_show_qs">show_qs</string>
<string name="pref_key_tags">current_tags_2</string>
</resources>
diff --git a/res/xml/main.xml b/res/xml/main.xml
index a8f3f0a..b8b6864 100644
--- a/res/xml/main.xml
+++ b/res/xml/main.xml
@@ -19,9 +19,6 @@
<SwitchPreference
android:key="@string/pref_key_tracing_on"
android:title="Start tracing" />
- <SwitchPreference
- android:key="@string/pref_key_show_qs"
- android:title="Show in Quick Settings" />
<Preference
android:key="dump"
android:persistent="false"
diff --git a/src/com/google/android/traceur/MainActivity.java b/src/com/google/android/traceur/MainActivity.java
index 9c8bb7c..3a27aed 100644
--- a/src/com/google/android/traceur/MainActivity.java
+++ b/src/com/google/android/traceur/MainActivity.java
@@ -45,7 +45,6 @@
public static final String ACTION_REFRESH_TAGS = "com.android.traceur.REFRESH_TAGS";
private TwoStatePreference mTracingOn;
- private TwoStatePreference mQs;
private AlertDialog mAlertDialog;
private SharedPreferences mPrefs;
@@ -74,13 +73,6 @@
mTracingOn = (TwoStatePreference) findPreference(getString(R.string.pref_key_tracing_on));
mTracingOn.setOnPreferenceChangeListener(this);
- mQs = (TwoStatePreference) findPreference(getString(R.string.pref_key_show_qs));
-
- if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M || "N".equals(Build.VERSION.CODENAME)) {
- getPreferenceScreen().removePreference(mQs);
- } else {
- mQs.setOnPreferenceChangeListener(this);
- }
mTags = (MultiSelectListPreference) findPreference(getString(R.string.pref_key_tags));
mTags.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@@ -156,7 +148,6 @@
private void refresh() {
Receiver.updateTracing(this, false);
- Receiver.updateQs(this);
}
private void refreshTags() {
diff --git a/src/com/google/android/traceur/QsService.java b/src/com/google/android/traceur/QsService.java
index 52b37f1..d11d60e 100644
--- a/src/com/google/android/traceur/QsService.java
+++ b/src/com/google/android/traceur/QsService.java
@@ -79,7 +79,6 @@
}
Receiver.updateTracing(this, true);
- Receiver.updateQs(this);
requestListeningState(this);
update();
}
diff --git a/src/com/google/android/traceur/Receiver.java b/src/com/google/android/traceur/Receiver.java
index 88d95ba..cc9ba8b 100644
--- a/src/com/google/android/traceur/Receiver.java
+++ b/src/com/google/android/traceur/Receiver.java
@@ -58,7 +58,7 @@
if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
updateTracing(context, false);
- updateQs(context);
+ QsService.requestListeningState(context);
} else if (FORCE_UPDATE_ACTION.equals(intent.getAction())) {
updateTracing(context, true);
} else if (DUMP_ACTION.equals(intent.getAction())) {
@@ -77,43 +77,6 @@
}
}
- public static void updateQs(Context context) {
- if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M || "N".equals(Build.VERSION.CODENAME)) {
- QsService.requestListeningState(context);
- return;
- }
- String qs_tiles = Settings.Secure.getString(context.getContentResolver(), QS_TILE_SETTING);
- if (TextUtils.isEmpty(qs_tiles)) {
- qs_tiles = "default";
- }
- if (!qs_tiles.contains(TILE_ACTION)) {
- Settings.Secure.putString(context.getContentResolver(), QS_TILE_SETTING,
- qs_tiles + ",intent(" + TILE_ACTION + ")");
- }
-
-
- SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
- boolean visible = prefs.getBoolean(context.getString(R.string.pref_key_show_qs), false);
-
- PendingIntent onClick = PendingIntent.getBroadcast(context, 0,
- new Intent(context, Receiver.class)
- .setAction(Receiver.DUMP_ACTION)
- , 0);
-
- PendingIntent longClick = PendingIntent.getBroadcast(context, 0,
- new Intent(context, Receiver.class)
- .setAction(Receiver.OPEN_ACTION)
- , 0);
-
- context.sendBroadcast(new Intent(TILE_ACTION)
- .putExtra("label", "Traceur")
- .putExtra("visible", visible)
- .putExtra("onClick", onClick)
- .putExtra("onLongClick", longClick)
- .putExtra("iconId", R.drawable.stat_sys_adb)
- .putExtra("iconPackage", context.getPackageName()));
- }
-
public static void updateTracing(Context context, boolean force) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
if (prefs.getBoolean(context.getString(R.string.pref_key_tracing_on), false) != AtraceUtils.isTracingOn() || force) {
