app_Settings

Go to file

Alex Johnston f566da5b55 Fix LocationForWorkPreferenceControllerTest

* If the location is disabled by admin, then the
  preference is disabled and the toggle is no
  longer shown. This means that setChecked is no
  longer called and the verify statement can be removed.
* If the location is off, the summary should be
  'Location is off' rather than 'off'. The verify
  statement is now updated with the correct summary.

Bug: 148755845
Test: atest com.android.settings.location.LocationForWorkPreferenceControllerTest
Change-Id: I089be0c4f8e8ec8c10160771055730289d72c8ed

2020-02-05 11:32:03 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

Add SettingsIntelligenceLogwriter

2019-03-27 07:14:20 +08:00

res

Merge "Change the Settings to app name with settings"

2020-02-05 09:44:02 +00:00

src/com/android/settings

Merge "Fix Startup fails when click "Color correction" of the selection menu in "Color correction" page"