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

resolve merge conflicts of b0c58aa to master

Browse Source 
Change-Id: Icc3af5956eb53de76c0384dccd662c6019c0958b
This commit is contained in:
Andrew Sapperstein
2016-04-20 17:56:12 -07:00
parent 1e3cc4a35d b0c58aa530
commit 2524686c66
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,6 +103,7 @@ import com.android.settings.notification.ZenModePrioritySettings;
import com.android.settings.notification.ZenModeScheduleRuleSettings;
import com.android.settings.notification.ZenModeSettings;
import com.android.settings.notification.ZenModeVisualInterruptionSettings;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.print.PrintJobSettingsFragment;
import com.android.settings.print.PrintSettingsFragment;
import com.android.settings.search.DynamicIndexableContentMonitor;
@@ -682,6 +683,9 @@ public class SettingsActivity extends SettingsDrawerActivity
}
}
// Will remove this line before submitting.
FeatureFactory.getFactory(this).createToastController().makeToast(this);
if (DEBUG_TIMING) Log.d(LOG_TAG, "onCreate took " + (System.currentTimeMillis() - startTime)
+ " ms");
}