commit 44572c4325679e3e38fee9f12478e29d2ebfc801
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Feb 06 05:47:40 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 06 05:47:49 2017 +0000
tree ac376eafc99c56cf6d852a2d99286d9dcc9d8846
parent 773a9a1272a8df56a075b6087cdf45e4175584e3
parent 3ac757ee2e86818223f14044fe60cd9f8c7e4700

Merge "Refactoring of auto fill - lifecycle, auth, improvements - Settings"

src/com/android/settings/backup/BackupSettingsActivity.java

diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java
index b195384..b376f6b 100644
--- a/src/com/android/settings/backup/BackupSettingsActivity.java
+++ b/src/com/android/settings/backup/BackupSettingsActivity.java
@@ -17,6 +17,8 @@
 package com.android.settings.backup;
 
 import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
 
@@ -41,8 +43,13 @@
                 Log.d(TAG,
                         "No manufacturer settings found, launching the backup settings directly");
             }
+            Intent intent = backupHelper.getIntentForBackupSettings();
+            // enable the activity before launching it
+            getPackageManager().setComponentEnabledSetting(intent.getComponent(),
+                    PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
+
             // use startActivityForResult to let the activity check the caller signature
-            startActivityForResult(backupHelper.getIntentForBackupSettings(), 1);
+            startActivityForResult(intent, 1);
             finish();
         } else {
             if (Log.isLoggable(TAG, Log.DEBUG)) {

src/com/android/settings/wifi/ConfigureWifiSettings.java

diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index 2b4743f..2a9c869 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -52,7 +52,7 @@
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        mProgressiveDisclosureMixin.setTileLimit(5);
+        mProgressiveDisclosureMixin.setTileLimit(4);
     }
 
     @Override