From 635504813ac05e5b97e1dbbc14811b302baca32a Mon Sep 17 00:00:00 2001 From: cretin45 Date: Wed, 27 Apr 2016 12:38:53 -0700 Subject: [PATCH] SetupWizard: Add Mod disovery language for mod ready devices Issue-id: CYNGNOS-2566 Change-Id: If88d2d62b5d2175ffe857d45dd9f6ce132129f2a --- res/drawable/mod_ready.xml | 42 +++++++++++++++++++ res/layout/setup_finished_page.xml | 36 +++++++++++++++- res/values/strings.xml | 4 ++ .../setupwizard/setup/FinishPage.java | 14 ++++++- .../setupwizard/util/SetupWizardUtils.java | 11 ++++- 5 files changed, 103 insertions(+), 4 deletions(-) create mode 100644 res/drawable/mod_ready.xml diff --git a/res/drawable/mod_ready.xml b/res/drawable/mod_ready.xml new file mode 100644 index 0000000..459ff51 --- /dev/null +++ b/res/drawable/mod_ready.xml @@ -0,0 +1,42 @@ + + + + + + \ No newline at end of file diff --git a/res/layout/setup_finished_page.xml b/res/layout/setup_finished_page.xml index beb7535..0f96893 100644 --- a/res/layout/setup_finished_page.xml +++ b/res/layout/setup_finished_page.xml @@ -20,12 +20,46 @@ android:layout_height="match_parent" android:background="@color/primary"> + + + + + + + + + + + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 78ea521..475ac8b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -95,4 +95,8 @@ Add your fingerprint Setup screen lock %1$s SIM detected + + + Welcome to the Post-App Era + Mods are intelligent, aware, and lightweight experiences built directly into the OS. When MOD thinks it can help, it will offer to activate them for you. diff --git a/src/com/cyanogenmod/setupwizard/setup/FinishPage.java b/src/com/cyanogenmod/setupwizard/setup/FinishPage.java index fa25bd1..552403e 100644 --- a/src/com/cyanogenmod/setupwizard/setup/FinishPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/FinishPage.java @@ -16,13 +16,17 @@ package com.cyanogenmod.setupwizard.setup; +import android.app.Activity; import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.os.Bundle; +import android.view.View; +import android.widget.ImageView; import com.cyanogenmod.setupwizard.R; import com.cyanogenmod.setupwizard.ui.SetupPageFragment; +import com.cyanogenmod.setupwizard.util.SetupWizardUtils; public class FinishPage extends SetupPage { @@ -71,7 +75,15 @@ public class FinishPage extends SetupPage { public static class FinishFragment extends SetupPageFragment { @Override - protected void initializePage() {} + protected void initializePage() { + final Activity activity = getActivity(); + if (activity != null && SetupWizardUtils.canHasModMOD(activity)) { + ImageView imageView = (ImageView) mRootView.findViewById(R.id.brand_logo); + imageView.setImageResource(R.drawable.mod_ready); + mRootView.findViewById(R.id.mod_welcome).setVisibility(View.VISIBLE); + mRootView.findViewById(R.id.mod_desc).setVisibility(View.VISIBLE); + } + } @Override protected int getLayoutResource() { diff --git a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java index 119380b..b60449d 100644 --- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java +++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java @@ -27,8 +27,6 @@ import android.hardware.fingerprint.FingerprintManager; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.wifi.WifiManager; -import android.os.IBinder; -import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; import android.service.persistentdata.PersistentDataBlockManager; @@ -52,6 +50,7 @@ public class SetupWizardUtils { private static final String TAG = SetupWizardUtils.class.getSimpleName(); public static final String GOOGLE_SETUPWIZARD_PACKAGE = "com.google.android.setupwizard"; + private static final String MODMOD_PACKAGE = "com.cyanogen.ambient.core"; private SetupWizardUtils(){} @@ -199,6 +198,14 @@ public class SetupWizardUtils { ConnectionResult.SERVICE_MISSING; } + /** + * The assumption here is that if ambient core is present, we have MODs. + * In the future we will link against the SDK and use the util there. + */ + public static boolean canHasModMOD(Context context) { + return isPackageInstalled(context, MODMOD_PACKAGE); + } + public static boolean accountExists(Context context, String accountType) { return AccountManager.get(context).getAccountsByType(accountType).length > 0; }