From cd93a79b8c0f61c9d3be2587f903ec5861bd9e51 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Thu, 29 Dec 2016 18:33:27 +0800 Subject: DeviceInfoSettings: Launch normal PlatLogo for LA version Since we've removed the Cid-esque PlatLogo as part of the LineageOS rebrand, get rid of the extra code and simply launch the AOSP PlatLogo when tapping on the LA version pref. Change-Id: I2b70d4115d890771999b0b1b97c8a70495a75562 --- src/com/android/settings/DeviceInfoSettings.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index 39eaa5a..41e14ba 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -242,7 +242,8 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In @Override public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { - if (preference.getKey().equals(KEY_FIRMWARE_VERSION)) { + if (preference.getKey().equals(KEY_FIRMWARE_VERSION) + || preference.getKey().equals(KEY_MOD_VERSION)) { System.arraycopy(mHits, 1, mHits, 0, mHits.length-1); mHits[mHits.length-1] = SystemClock.uptimeMillis(); if (mHits[0] >= (SystemClock.uptimeMillis()-500)) { @@ -367,20 +368,6 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In if (b.getBoolean(CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_BOOL)) { ciActionOnSysUpdate(b); } - } else if (preference.getKey().equals(KEY_MOD_VERSION)) { - System.arraycopy(mHits, 1, mHits, 0, mHits.length-1); - mHits[mHits.length-1] = SystemClock.uptimeMillis(); - if (mHits[0] >= (SystemClock.uptimeMillis()-500)) { - Intent intent = new Intent(Intent.ACTION_MAIN); - intent.putExtra("is_cm", true); - intent.setClassName("android", - com.android.internal.app.PlatLogoActivity.class.getName()); - try { - startActivity(intent); - } catch (Exception e) { - Log.e(LOG_TAG, "Unable to start activity " + intent.toString()); - } - } } return super.onPreferenceTreeClick(preferenceScreen, preference); } -- cgit v1.1