Merge "Default apps setting for managed profile"

diff --cc AndroidManifest.xml
index 4ff16f9,c571a9b..3a4bb08
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -2713,14 -2711,8 +2713,12 @@@
                  <action android:name="android.settings.MANAGE_DEFAULT_APPS_SETTINGS" />
                  <category android:name="android.intent.category.DEFAULT" />
              </intent-filter>
 +            <intent-filter>
 +                <action android:name="android.settings.HOME_SETTINGS" />
 +                <category android:name="android.intent.category.DEFAULT" />
 +            </intent-filter>
              <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                         android:value="com.android.settings.applications.ManageDefaultApps" />
-             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                        android:value="true" />
          </activity>
  
          <!-- Conditional receivers, only enabled during silenced state, default off-->

diff --cc src/com/android/settings/applications/ManageAssist.java
index 24c558c,938feb0..fca124f
--- 1/src/com/android/settings/applications/ManageAssist.java
--- 2/src/com/android/settings/applications/ManageAssist.java
+++ b/src/com/android/settings/applications/ManageAssist.java
@@@ -25,9 -27,10 +27,10 @@@ import android.provider.Settings
  import android.support.v14.preference.SwitchPreference;
  import android.support.v7.preference.Preference;
  
 -import com.android.internal.logging.MetricsLogger;
 +import com.android.internal.logging.MetricsProto.MetricsEvent;
  import com.android.settings.R;
  import com.android.settings.SettingsPreferenceFragment;
+ import com.android.settings.Utils;
  import com.android.settings.voice.VoiceInputListPreference;
  
  /**

diff --cc src/com/android/settings/applications/ManageDefaultApps.java
index 77d268d,f08e367..b421c9d
--- 1/src/com/android/settings/applications/ManageDefaultApps.java
--- 2/src/com/android/settings/applications/ManageDefaultApps.java
+++ b/src/com/android/settings/applications/ManageDefaultApps.java
@@@ -31,9 -32,8 +32,8 @@@ import android.text.TextUtils
  import android.util.Log;
  
  import com.android.internal.content.PackageMonitor;
 -import com.android.internal.logging.MetricsLogger;
 +import com.android.internal.logging.MetricsProto.MetricsEvent;
  import com.android.settings.R;
- import com.android.settings.SettingsPreferenceFragment;
  import com.android.settings.search.BaseSearchIndexProvider;
  import com.android.settings.search.Index;
  import com.android.settings.search.Indexable;

diff --cc src/com/android/settings/print/PrintSettingsFragment.java
index 537f5de,c5db391..b59c297
--- 1/src/com/android/settings/print/PrintSettingsFragment.java
--- 2/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@@ -58,11 -54,10 +54,10 @@@ import android.widget.Button
  import android.widget.TextView;
  
  import com.android.internal.content.PackageMonitor;
 -import com.android.internal.logging.MetricsLogger;
 +import com.android.internal.logging.MetricsProto.MetricsEvent;
  import com.android.settings.DialogCreatable;
  import com.android.settings.R;
- import com.android.settings.SettingsPreferenceFragment;
+ import com.android.settings.utils.ProfileSettingsPreferenceFragment;
  import com.android.settings.dashboard.SummaryLoader;
  import com.android.settings.search.BaseSearchIndexProvider;
  import com.android.settings.search.Indexable;