TreeHugger Robot
09c04410cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8d0376c98c
-s ours am: 0b99020b5a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14416159
Change-Id: Ief2ea4249c89a9cbf17a702576f0b9cfc30bea60
2021-05-19 11:19:57 +00:00
TreeHugger Robot
b6859223b0
Merge "Remove Advanced item in Language & input Settings." into sc-dev am: f2ec0fbf83
am: dbe3c72bb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410006
Change-Id: Ie5139f823f78bf147edb8770266c823be061dae3
2021-05-19 11:13:33 +00:00
Kevin Chyn
b3f9271fa9
Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev am: 08b7833120
am: c60fcecf32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414017
Change-Id: Ie3b5db627f3598ece2ac21cf8f9ab5c829109acc
2021-05-19 10:36:28 +00:00
menghanli
0afc2de85e
Fix glifLayout is not align the preference in SuW
...
Bug: 186076332
Test: Run initBCTestEnv_S.sh and switch to RTL and LTR language to
check layout
Change-Id: I5f22b8853d036f22a2e66a6144660950c268d89b
2021-05-19 09:23:14 +00:00
bsears
f17a812842
Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev am: deb2acc9b3
am: 15b21dfed4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410366
Change-Id: Ib3f4d3bad60cb72c1c6407e0bdfc1f4e01823a8b
2021-05-19 09:20:30 +00:00
Jason Chiu
817fb55032
Merge "Fix NullPointerException at VolumeSliceHelper" into sc-dev am: 9f24967458
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622863
Change-Id: Idbe15167ca0f5dafe886af8b7fca6a8d49a960e5
2021-05-19 07:21:20 +00:00
Jason Chiu
9f24967458
Merge "Fix NullPointerException at VolumeSliceHelper" into sc-dev
2021-05-19 07:03:17 +00:00
Yi Jiang
f1a04d7284
Merge "Fixes ScreenTimeoutSettingsTest" into sc-dev am: 07532443ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14629551
Change-Id: I0d1a3aeb5fc2494af81dec11f9b50395e2b5dd57
2021-05-19 06:50:59 +00:00
Peiyong Lin
4e4a7f0dbd
Merge "Add Game settings support." into sc-dev am: d32d11248e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14553339
Change-Id: Id122a4cd8356f8ee735df146a1631238e81178c5
2021-05-19 06:49:45 +00:00
Yi Jiang
07532443ca
Merge "Fixes ScreenTimeoutSettingsTest" into sc-dev
2021-05-19 06:10:03 +00:00
Peiyong Lin
d32d11248e
Merge "Add Game settings support." into sc-dev
2021-05-19 05:42:14 +00:00
Jason Chiu
728081f9bb
Fix NullPointerException at VolumeSliceHelper
...
Race condition happens on accessing a map while system is destroying it.
Test: manual, robotest
Fixes: 188114877
Change-Id: I245121b95d1d4db02e3107a47c6d3ae13a5d32e5
2021-05-19 13:19:55 +08:00
Suprabh Shukla
63fd87a13a
Setting result earlier than onPause
...
Setting the result in onPause is too late for delivering it to the
requesting activity. Changing to setting the result any time the
uncommitted state is written. The state will still be committed in
onPause only.
Test: Manually with a test app using startActivityForResult.
Bug: 188477366
Change-Id: I676c99e7d2a64b644cef60ecd14728d4d49180c3
2021-05-18 22:13:47 -07:00
Weng Su
eccb787bbb
Merge "Introduce new Disconnect functionality for Wifi networks in Internet Panel only" into sc-dev am: 3d904eba71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622856
Change-Id: I94d660df34cf3873eab89b7cf2f7ff28b8f6ade3
2021-05-19 04:35:36 +00:00
Weng Su
46d3fc525e
Merge "Improve discoverability of the intent & actions progress" into sc-dev am: ca5f4e4952
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622857
Change-Id: Ibe3c2cbce2440578dceb8b67f09feae66d07d2ae
2021-05-19 04:34:01 +00:00
Weng Su
3d904eba71
Merge "Introduce new Disconnect functionality for Wifi networks in Internet Panel only" into sc-dev
2021-05-19 03:48:24 +00:00
Weng Su
ca5f4e4952
Merge "Improve discoverability of the intent & actions progress" into sc-dev
2021-05-19 03:48:16 +00:00
TreeHugger Robot
08e146982b
Merge "Apply color extraction for Fingerprint enrollment" into sc-dev am: bac284a622
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622855
Change-Id: Ia9107de5e771eac1e7862e7ca600816bdae57e12
2021-05-19 03:41:00 +00:00
TreeHugger Robot
80c3d12ff9
Merge "Visual update for FaceSettings" into sc-dev am: 2a7e608ef2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14551407
Change-Id: Iab74ccda074e474d65f70c9b3ace8105d4abee8e
2021-05-19 03:40:54 +00:00
TreeHugger Robot
aaf4959555
Merge "Fix the text contrast for biometric header" into sc-dev am: a07eb69948
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14605930
Change-Id: I633edb6a3dc4a92143d6d4fe28ac023d9f116ee9
2021-05-19 03:40:49 +00:00
TreeHugger Robot
d3f0fc54a7
Merge "Update the layout of Pattern/PIN/Password confirmation" into sc-dev am: 6d550713dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554361
Change-Id: I7b44bb1cf9e244e063b13ce5fbc8c83b391665aa
2021-05-19 03:40:38 +00:00
TreeHugger Robot
7bb6afbfd1
Merge "Tweak the layout for Pattern/PIN/Password enrollment" into sc-dev am: 4a67b1c099
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554357
Change-Id: Ic60fa99f77c21aef31aa570ace8cbbd5a38394b2
2021-05-19 03:39:58 +00:00
TreeHugger Robot
bac284a622
Merge "Apply color extraction for Fingerprint enrollment" into sc-dev
2021-05-19 03:19:56 +00:00
TreeHugger Robot
2a7e608ef2
Merge "Visual update for FaceSettings" into sc-dev
2021-05-19 03:19:07 +00:00
TreeHugger Robot
a07eb69948
Merge "Fix the text contrast for biometric header" into sc-dev
2021-05-19 03:17:48 +00:00
TreeHugger Robot
6d550713dd
Merge "Update the layout of Pattern/PIN/Password confirmation" into sc-dev
2021-05-19 03:16:47 +00:00
TreeHugger Robot
4a67b1c099
Merge "Tweak the layout for Pattern/PIN/Password enrollment" into sc-dev
2021-05-19 03:15:28 +00:00
Dmitri Plotnikov
6deeadc714
Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev am: 501eea7fa2
am: 6acbd70713
am: c2515e9c20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14346184
Change-Id: I8471bb1aff886e76277cd90bb5230776dc981438
2021-05-19 03:05:41 +00:00
TreeHugger Robot
835f507f07
Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev am: 8d1fd73e89
am: e0e26649fb
am: fbb3409f9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186629
Change-Id: I0937561c24bc3e1779890b3760c50b8c3d89d69d
2021-05-19 02:58:42 +00:00
TreeHugger Robot
d2f8bd093e
Merge "Update apps icon in Sound > Media page to correct size." into sc-dev am: 80daf4fc49
am: 07427eeeb3
am: c38bda35bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410003
Change-Id: I16c0c14a0aec25d5133dead35d9efe9b0db5744c
2021-05-19 02:58:29 +00:00
Yichi Chen
837ff92cd9
Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev am: ffbea30a18
am: 97efa6eed4
am: 3c5b65fb20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352150
Change-Id: If6dadccf0a8a8f9a4710eee0fa8e8e8abe8a1b2f
2021-05-19 02:58:21 +00:00
TreeHugger Robot
c3b453e52c
Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev am: 001dcc9e93
am: 21f81feb86
am: f7191fd0a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409961
Change-Id: I9b4871c0fb436953504be29fad1f4f9068f970c3
2021-05-19 02:58:12 +00:00
YUKAI HUNG
74d44526fd
Merge "Add new field for data interpolation usage" into sc-dev am: f988790908
am: 29cc5c19a0
am: 51650d3e59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409677
Change-Id: I8a129d5170165ffc69e5da29256ff633841ab003
2021-05-19 01:44:33 +00:00
Ryan Lin
f03ec080d9
Merge "Move Magnification Mode Settings to the main page" into sc-dev am: 194015b774
am: 9d46a4fec6
am: ddc3ecb071
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327003
Change-Id: Iee4052001ff4e338a279adb4fb6f803f715bf1f3
2021-05-19 01:44:25 +00:00
Menghan Li
a884e06f62
Merge "[Material Next] Update accessibility tool footer style" into sc-dev am: da60d4e842
am: 484782bc2e
am: 124dd2d99a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260604
Change-Id: I1c7b49692b0ed6b15aaadae43ac414ec5c20ecc8
2021-05-19 01:44:20 +00:00
Menghan Li
163a4c3bf4
Merge "Hide the accessibility location preference when gesture navigation mode enabled." into sc-dev am: c7ddea6aa8
am: cc938176bd
am: 7be990b3a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408665
Change-Id: I2bd2914b289bb61526a350d8ce05a48c37184956
2021-05-19 01:44:13 +00:00
Menghan Li
f2ae3a2df9
Merge "[Material Next] Audio adjustment customized seekbar" into sc-dev am: 8270d175b8
am: 055eed3d94
am: 55159685c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409958
Change-Id: I01742410f350224fb5f929a92b7aa5b327e09e55
2021-05-19 01:44:07 +00:00
TreeHugger Robot
9b45c2f15c
Merge "Revert "Refine battery help message layout"" into sc-dev am: c3dc96ebc3
am: cdceaf3602
am: 34ea71e95c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409960
Change-Id: I2316ad0c9fa9dcb2d218f0206f7254065e4d78a6
2021-05-19 01:44:02 +00:00
Mill Chen
cfa02fe9c6
Increasing the character limit am: b4a9916adf
am: 71c15d3f18
am: b6fcf2e79f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408673
Change-Id: I2451fc17aa03f0114a04330ff33ffb9a90ebbe08
2021-05-19 01:43:56 +00:00
TreeHugger Robot
612e03b45e
Merge "Update password & account settings icon size" into sc-dev am: b0bd79d468
am: ea8d23e3b1
am: dd9c4d37ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408664
Change-Id: I0792103f28a9b6159e5a5d1420e044cebce1ad63
2021-05-19 01:43:51 +00:00
TreeHugger Robot
ad1d5d94d3
Merge "Fix the unaligned title of injected items" into sc-dev am: d32e0cf8a6
am: a130f44094
am: 5d037d2196
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408661
Change-Id: I00ca2afa7f9db13dd4e566cad961db590705ad73
2021-05-19 01:43:45 +00:00
TreeHugger Robot
0c009f25a1
Merge "Update the category style in pair new device page." into sc-dev am: dc0613d172
am: dc9beae9ec
am: d85c089e2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408656
Change-Id: I804214242c34cb9feb458680ae0b8b59c1726342
2021-05-19 01:43:39 +00:00
Wesley.CW Wang
0811e513aa
Refine battery help message layout am: 2369167d63
am: 0c97d1b69e
am: 90ba23c812
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352143
Change-Id: Iebdc894882ccd1de312e2b266c11761540b1dd20
2021-05-19 01:43:34 +00:00
Wesley Wang
c2129fb1f3
Merge "Update batter saver page footer (1/2)" into sc-dev am: 12bc0921ce
am: 1a9df9004f
am: b17fb7541e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352147
Change-Id: Ic6c1520b37805462e71b0c49860e80be215a6292
2021-05-19 01:43:19 +00:00
YUKAI HUNG
e609884ce3
Merge "Refine the app/system section divider content show/hide rule" into sc-dev am: 16b60aa2d7
am: bc91fe41da
am: 213a6c6bce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327009
Change-Id: I893f03d923c4d37a1fbc4f1c03ef97f451dde00b
2021-05-19 01:43:11 +00:00
Bill Yi
0b006bfe79
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f1ae5d67a
-s ours am: e8b350c1c8
-s ours am: b1d10f6842
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14402447
Change-Id: I896f4a13f2f1d7b3e8cf94a1d28db5f26e62ec6c
2021-05-19 01:43:06 +00:00
TreeHugger Robot
d3f4282b50
Merge "[Security Report] Fix RequestToggleWiFiActivity overlaid issue" into sc-dev am: 6907a1feb8
am: 670c578014
am: 1ccb74494d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352470
Change-Id: I4dbb9fe23e86416cad27f97012828cda463b3f69
2021-05-19 01:43:01 +00:00
TreeHugger Robot
59227c7792
Merge "Add placeholder values to placeholder settings" into sc-dev am: fb2e8837f1
am: 8133c1f6ad
am: 02ed8d8778
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356125
Change-Id: I9f3798deb6095c1195b9926fa3ec86b290137956
2021-05-19 01:42:53 +00:00
TreeHugger Robot
c77ebfc5d0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 01aeea2e4a
-s ours am: b1802372ab
-s ours am: c830499aa5
-s ours am: 43d2800863
-s ours am: 567e796e30
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356624
Change-Id: Id0959f7169b2aec7f63a8b56cc392906bd368fbd
2021-05-19 01:42:47 +00:00
Bill Yi
8e6898749c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 090db24c56
-s ours am: b702fdea6d
-s ours am: 226146afee
-s ours am: 93c1e94f12
-s ours am: 4037c9d0ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356374
Change-Id: I17d51fcd2acfcce6f07d2dca1281e3e12b540a07
2021-05-19 01:42:42 +00:00