Bill Yi 58957af851 Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE ...

Merged-In: I1da09579d5ce7b2c67b4a7db381c779a5c5ccb6b
Change-Id: Ifdb33d0e12e1a487f694c37e3e99f87af06b6b74

2020-05-05 17:02:32 +00:00

..

gateway

Merge "Revert "[Setting] Cleanup Unused SimSettings"" am: 487c94c11a am: 74a7a3cfb2

2019-12-14 01:23:03 +00:00

instrumentation

MetricId: Avoid byte[] and string ambiguity

2020-03-10 12:49:56 -07:00

BasePreferenceController.java

Move some slice related api out of BasePreferenceController

2019-02-15 14:21:10 -08:00

FeatureFlags.java

Remove feature flag for slice injection

2019-04-19 13:13:03 -07:00

HideNonSystemOverlayMixin.java

Enable/disable a few things in debuggable builds

2019-03-26 12:11:35 -07:00

InstrumentedActivity.java

Settings Fragment Migration (Build pass app)

2018-07-11 18:24:51 -07:00

InstrumentedFragment.java

Settings Fragment Migration (Build pass app)

2018-07-11 18:24:51 -07:00

InstrumentedPreferenceFragment.java

Revert "Revert "Fix test case fail""

2018-12-19 18:57:12 +00:00

OnActivityResultListener.java

Allow activity to delegate onActivityResult to fragments

2018-07-17 10:59:02 -07:00

PreferenceControllerListHelper.java

Migrate UserDictionaryList to DashboardFragment

2018-04-17 12:27:24 -07:00

PreferenceControllerMixin.java

Declare "searchable" attribute for preferences.

2018-08-16 09:06:39 -07:00

PreferenceXmlParserUtils.java

Convert xml based API allowDynamicSummaryInSlice to java

2019-04-01 12:39:30 -07:00

SettingsBaseActivity.java

RESTRICT AUTOMERGE

2020-03-19 04:52:35 +00:00

SettingsUIDeviceConfig.java

Add flag to disable part of event_logging in Settings.

2019-05-07 14:23:23 -07:00

SliderPreferenceController.java

Enforce min value on panel slices slider

2019-04-16 16:30:08 +00:00

SubSettingLauncher.java

Font size page support light theme in deferred setup

2019-05-14 14:01:14 +08:00

TogglePreferenceController.java

Sort imports

2018-08-28 22:13:15 +00:00

WorkProfilePreferenceController.java

Add "Work profile" section to Languages and input settings

2019-01-25 10:14:45 -08:00