Galia Peycheva
66b01a9a99
Merge "Use SettingsLib string for blur developer option" into sc-dev am: 33a9f49892
am: 7d25b50b2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788507
Change-Id: I065567300e601468fd2609ae26c6f0563fca382d
2021-06-07 03:08:50 +00:00
YUKAI HUNG
7ac4829c89
Merge "Remove missed added testing locale to cause flaky" into sc-dev am: fa476aef12
am: 8a7e4b9ed0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809876
Change-Id: I9e93c92e93238e7511622756adab1a78517243cd
2021-06-07 03:08:42 +00:00
Betty Chang
aae41a7e99
Merge "[GAR] Set the correct color and style to panel UI" into sc-dev am: 5b23f3b923
am: ba209f63aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800153
Change-Id: I7bbd6f8cf021a54a527ee78498fd0865eba71b50
2021-06-07 03:08:36 +00:00
Betty Chang
262318ef09
Merge "Remove Connect to public network for Network Rating Provider" into sc-dev am: f4fafb97ff
am: 16fc9f7a50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809873
Change-Id: I216c81ea0df91f8b246f49735fc2742b19e18fb5
2021-06-07 03:08:31 +00:00
tim peng
c7a2b911e1
Merge "Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 032b2b20bc
am: 94fbcf042b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782146
Change-Id: I56dffb55d695c1a78310831f1e7ded7545eada62
2021-06-07 03:08:25 +00:00
TreeHugger Robot
39a55f6fad
Merge "Fix overlapping problem on running services page" into sc-dev am: 28128df960
am: 96d22f4efa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800150
Change-Id: I5ccaf067474921af47072b9a3879da380c8358d7
2021-06-07 03:08:20 +00:00
Yanting Yang
e5c4442637
Merge "Deprecate silky flag for official release" into sc-dev am: 09666f9ef4
am: b2f8a8aef3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800152
Change-Id: I1bfc8aa987d39b42530a26366a5f94cc2fec7fdf
2021-06-07 03:05:24 +00:00
Kevin Han
34f700a46f
Merge "Move unused apps count calculation to bg thread" into sc-dev am: 603cd6c44c
am: cbc3c1780d
am: cbbb4dbe41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795269
Change-Id: I4eeb657c2059fe63ac32d6069511e530db599125
2021-06-05 00:13:33 +00:00
Kevin Chyn
40f13eeb79
Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4
am: 0a8fcd8fe9
am: ee1cb6a1cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764
Change-Id: Iafe1be9ca695bc3aacc2fe116330439154fb375e
2021-06-05 00:13:21 +00:00
Kevin Han
8fc4e9d496
Merge "Move unused apps count calculation to bg thread" into sc-dev am: 603cd6c44c
am: 71c447494a
am: 8e813a0fbc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795269
Change-Id: I42dedf8798bc6af57347c0d5f6ec672622a0ac80
2021-06-05 00:13:10 +00:00
Kevin Chyn
d0b69e24b1
Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4
am: e926e6757f
am: c9ef612518
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764
Change-Id: I5f63620ddbcaf0856ad309080bf4908862461272
2021-06-05 00:12:58 +00:00
Kevin Han
cbbb4dbe41
Merge "Move unused apps count calculation to bg thread" into sc-dev am: 603cd6c44c
am: cbc3c1780d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795269
Change-Id: Ia6de696e2f8fd6b2ffa98caae3ae7fbb803d126e
2021-06-04 23:59:13 +00:00
Kevin Chyn
ee1cb6a1cb
Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4
am: 0a8fcd8fe9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764
Change-Id: I8fe00b5cb6d9678b1dd203e528e5099cff95029d
2021-06-04 23:58:57 +00:00
Kevin Han
8e813a0fbc
Merge "Move unused apps count calculation to bg thread" into sc-dev am: 603cd6c44c
am: 71c447494a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795269
Change-Id: Ibd52a52cb703a02dc5b10dd4b98fccf1a559f418
2021-06-04 23:58:29 +00:00
Kevin Chyn
c9ef612518
Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4
am: e926e6757f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764
Change-Id: Ifa515fe41d6c0ea2d94a9d4567b7da80a9625cb2
2021-06-04 23:58:19 +00:00
Kevin Han
71c447494a
Merge "Move unused apps count calculation to bg thread" into sc-dev am: 603cd6c44c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795269
Change-Id: I690efa597ac55bb601d7bf2608ee3e8b56d6e045
2021-06-04 23:44:09 +00:00
Kevin Chyn
e926e6757f
Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764
Change-Id: I301973cb4053811181a9c7564e739317fa8c45b8
2021-06-04 23:44:01 +00:00
Kevin Han
cbc3c1780d
Merge "Move unused apps count calculation to bg thread" into sc-dev am: 603cd6c44c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795269
Change-Id: I0aacb5fd54793c53b7f5ca15cbfb16128a7d6e80
2021-06-04 23:41:35 +00:00
Kevin Chyn
0a8fcd8fe9
Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764
Change-Id: Id795687f5bc58a57a75f8222030f220a46f1988b
2021-06-04 23:41:23 +00:00
Kevin Han
603cd6c44c
Merge "Move unused apps count calculation to bg thread" into sc-dev
2021-06-04 23:35:55 +00:00
Kevin Chyn
4a0a03f0e4
Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev
...
* changes:
Update fingerprint/face enrollment to lock icon
Update fingerprint intro drawable
Remove SUW-specific fingerprint enroll description
2021-06-04 23:26:19 +00:00
Chloris Kuo
7daaba09b1
Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9
am: d07a484c46
am: ae5c01e692
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751
Change-Id: I81c7315c5f5d39836afa855d6872f2e88034f901
2021-06-04 21:11:34 +00:00
Chloris Kuo
80d21be186
Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9
am: 7327a3426d
am: e83a9465b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751
Change-Id: Id7a47696bcdd5a3389e407833c9dda6189fb821f
2021-06-04 21:10:58 +00:00
Chloris Kuo
ae5c01e692
Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9
am: d07a484c46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751
Change-Id: I3b8531d65d5d9202a9a730b6f1840fad2ac22a5b
2021-06-04 20:57:15 +00:00
Chloris Kuo
e83a9465b2
Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9
am: 7327a3426d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751
Change-Id: I4146ddd2a733f32aae801bcc2a2475054204276e
2021-06-04 20:55:40 +00:00
Chloris Kuo
7327a3426d
Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751
Change-Id: I7369b7103d64a354574ae87dbc2eecb01788029a
2021-06-04 20:41:33 +00:00
Chloris Kuo
d07a484c46
Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751
Change-Id: I02e0e2ff3b9d6012a3ada8b215f79eec4e844c3b
2021-06-04 20:39:39 +00:00
Chloris Kuo
f9bde76ab9
Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev
2021-06-04 20:27:46 +00:00
Kevin Chyn
ade59af392
Update fingerprint/face enrollment to lock icon
...
Bug: 187460696
Test: manual
Change-Id: I490ad4246e54ed4ae2e8539e8e9eabba1ccecff6
2021-06-04 12:49:31 -07:00
Kevin Chyn
3e27fd8752
Update fingerprint intro drawable
...
Bug: 187460696
Test: manual
Change-Id: I92ae38b8851be1e1ad91c9723264249424b9078d
2021-06-04 12:49:23 -07:00
Kevin Chyn
47257c05c8
Remove SUW-specific fingerprint enroll description
...
Bug: b/187460696
Test: adb shell am start -n com.google.android.setupwizard/.SetupWizardTestActivity
Change-Id: I5db49dd27439445aae9819dbdd0728ac5c02f0cd
2021-06-04 12:47:35 -07:00
TreeHugger Robot
123dac14ae
Merge "Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController" into sc-dev am: 8d9d889a8e
am: f436f855c0
am: 253bfebc64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14628750
Change-Id: I790fb34f65a92017dd54b8342fcc8197d079510a
2021-06-04 19:19:26 +00:00
TreeHugger Robot
5311ac582f
Merge "Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController" into sc-dev am: 8d9d889a8e
am: e84551c9d4
am: 686b2037fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14628750
Change-Id: I6ba9dba78705be934d1682453b096e3887bd1c63
2021-06-04 19:18:58 +00:00
TreeHugger Robot
253bfebc64
Merge "Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController" into sc-dev am: 8d9d889a8e
am: f436f855c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14628750
Change-Id: I6274c1ec86544066ee275d5eebe858cfa319786c
2021-06-04 18:59:23 +00:00
TreeHugger Robot
686b2037fb
Merge "Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController" into sc-dev am: 8d9d889a8e
am: e84551c9d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14628750
Change-Id: Ic5e77061d77032e44361d6ee10cca6e56dd387d2
2021-06-04 18:57:39 +00:00
TreeHugger Robot
e84551c9d4
Merge "Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController" into sc-dev am: 8d9d889a8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14628750
Change-Id: I7abd4ab0af12f4cbb7a7ff30995a2ccea968fefe
2021-06-04 18:43:58 +00:00
TreeHugger Robot
f436f855c0
Merge "Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController" into sc-dev am: 8d9d889a8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14628750
Change-Id: If23049d5758d7e2c87ead1c903d1fef36a577b5c
2021-06-04 18:42:16 +00:00
Chloris Kuo
5028e6e6a6
Fix NotificationAssistantPreferenceController constructor
...
Fix flaky test due to the constructor must either only take Context, or
(Context, String).
Bug: 187998873
Test: CodeInspectionTest, NotificationAssistantPreferenceControllerTest
Change-Id: Ie383ea6773afda05adfb7aa9d7de9e27676f6b29
2021-06-04 11:39:36 -07:00
TreeHugger Robot
8d9d889a8e
Merge "Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController" into sc-dev
2021-06-04 18:31:03 +00:00
TreeHugger Robot
5aa05260f7
Merge "Storage Settings hides categories when loading" into sc-dev am: 03d4644673
am: 017de20112
am: 938b5681b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772155
Change-Id: I77dcb34c23b8d02204e42adc8ebff435081aacee
2021-06-04 12:04:42 +00:00
TreeHugger Robot
549dac0dc3
Merge "Storage Settings hides categories when loading" into sc-dev am: 03d4644673
am: 1a181a3239
am: e6c6db1f61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772155
Change-Id: I321a39dc2d76d16a8f4551f7e5157a0d1a1fc7b3
2021-06-04 12:04:29 +00:00
TreeHugger Robot
938b5681b4
Merge "Storage Settings hides categories when loading" into sc-dev am: 03d4644673
am: 017de20112
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772155
Change-Id: I5add7a18c69de64fb587987d2d17502b8727f575
2021-06-04 11:44:23 +00:00
TreeHugger Robot
e6c6db1f61
Merge "Storage Settings hides categories when loading" into sc-dev am: 03d4644673
am: 1a181a3239
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772155
Change-Id: Iaeae2fa4a87f76f86ca061306ac96915c5fdf9fd
2021-06-04 11:43:28 +00:00
TreeHugger Robot
1a181a3239
Merge "Storage Settings hides categories when loading" into sc-dev am: 03d4644673
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772155
Change-Id: I998d4981c82300ae92134f9fd71d6dded45af483
2021-06-04 11:30:19 +00:00
TreeHugger Robot
017de20112
Merge "Storage Settings hides categories when loading" into sc-dev am: 03d4644673
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772155
Change-Id: Ic8a5886cd19213cc4fe54157fa441b107e1db15c
2021-06-04 11:26:14 +00:00
TreeHugger Robot
03d4644673
Merge "Storage Settings hides categories when loading" into sc-dev
2021-06-04 11:09:01 +00:00
Stanley Wang
94620707e6
Merge "Fix NPE in SettingsMainSwitchPreference." into sc-dev am: d9aa0b070f
am: a608284e61
am: 1294126804
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831309
Change-Id: I90cd9494c665a1363fafaa197ea67fa23c71ccc5
2021-06-04 10:42:13 +00:00
TreeHugger Robot
84648d925d
Merge "Apply sliding transition to biometric settings" into sc-dev am: 7f13b83ef1
am: 9aa430c23e
am: 387055166f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819341
Change-Id: Ia87127f63be69b5ba5dfb5d9f12fb5e1751855a5
2021-06-04 10:42:05 +00:00
Stanley Wang
1294126804
Merge "Fix NPE in SettingsMainSwitchPreference." into sc-dev am: d9aa0b070f
am: a608284e61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831309
Change-Id: Ie311c6ee66cbfbab5ae0a623521b44b7c9012e0f
2021-06-04 10:34:39 +00:00
TreeHugger Robot
387055166f
Merge "Apply sliding transition to biometric settings" into sc-dev am: 7f13b83ef1
am: 9aa430c23e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819341
Change-Id: Iebb4638445b087226c2aa8fedbad1b7a3b2dd274
2021-06-04 10:34:34 +00:00