PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of d5b3a5d to nyc-mr1-dev

Browse Source 
Change-Id: I1eb01bfdad24935efbbdbeaee0dcf1c374a2cadb
This commit is contained in:
Tony Mak
2016-05-04 11:14:48 +01:00
parent cce4c8e845 d5b3a5d342
commit 8f14564787
6 changed files with 265 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/SettingsActivity.java
View File

@@ -57,6 +57,7 @@ import com.android.settings.accessibility.AccessibilitySettingsForSetupWizard;
import com.android.settings.accessibility.CaptionPropertiesFragment;
import com.android.settings.accounts.AccountSettings;
import com.android.settings.accounts.AccountSyncSettings;
import com.android.settings.accounts.ManagedProfileSettings;
import com.android.settings.applications.AdvancedAppSettings;
import com.android.settings.applications.DrawOverlayDetails;
import com.android.settings.applications.InstalledAppDetails;
@@ -330,6 +331,7 @@ public class SettingsActivity extends SettingsDrawerActivity
AdvancedAppSettings.class.getName(),
WallpaperTypeSettings.class.getName(),
VrListenerSettings.class.getName(),
ManagedProfileSettings.class.getName(),
};