Settings: Actually expose protected apps settings.

  Since protected apps are seemingly useful now,
  promote them within the privacy guard menu.

Change-Id: I9024cd88f2655f18fb2b68fcf9d75b12e4b5a97e
TICKET: CYNGNOS-84

1 files changed, 23 insertions, 0 deletions

diff --git a/src/com/android/settings/applications/ProtectedAppsActivity.java b/src/com/android/settings/applications/ProtectedAppsActivity.java
index 476771b..a1c6cd5 100644
--- a/src/com/android/settings/applications/ProtectedAppsActivity.java
+++ b/src/com/android/settings/applications/ProtectedAppsActivity.java
@@ -70,6 +70,7 @@ public class ProtectedAppsActivity extends Activity {
 
     private boolean mWaitUserAuth = false;
     private boolean mUserIsAuth = false;
+    private Intent mTargetIntent;
 
     private HashSet<ComponentName> mProtectedApps = new HashSet<ComponentName>();
 
@@ -77,6 +78,14 @@ public class ProtectedAppsActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        // Handle incoming target activity
+        Intent incomingIntent = getIntent();
+        if (incomingIntent.hasExtra("com.android.settings.PROTECTED_APP_TARGET_INTENT")) {
+            mTargetIntent =
+                    incomingIntent.getParcelableExtra(
+                            "com.android.settings.PROTECTED_APP_TARGET_INTENT");
+        }
+
         setTitle(R.string.protected_apps);
         setContentView(R.layout.hidden_apps_list);
 
@@ -97,6 +106,11 @@ public class ProtectedAppsActivity extends Activity {
             // Require unlock
             Intent lockPattern = new Intent(this, LockPatternActivity.class);
             startActivityForResult(lockPattern, REQ_ENTER_PATTERN);
+        } else {
+            //LAUNCH
+            if (mTargetIntent != null) {
+                launchTargetActivityInfoAndFinish();
+            }
         }
     }
 
@@ -169,6 +183,9 @@ public class ProtectedAppsActivity extends Activity {
                     case RESULT_OK:
                         //Nothing to do, proceed!
                         mUserIsAuth = true;
+                        if (mTargetIntent != null) {
+                            launchTargetActivityInfoAndFinish();
+                        }
                         break;
                     case RESULT_CANCELED:
                         // user failed to define a pattern, do not lock the folder
@@ -182,6 +199,12 @@ public class ProtectedAppsActivity extends Activity {
         }
     }
 
+    private void launchTargetActivityInfoAndFinish() {
+        Intent launchIntent = mTargetIntent;
+        startActivity(launchIntent);
+        finish();
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         menu.add(0, MENU_RESET, 0, R.string.menu_hidden_apps_delete)