Commit Graph

81943 Commits

Author SHA1 Message Date
Hugh Chen
771651c2f6 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours am: 392fb7a4f7 am: 0248e7b7cf -s ours am: caf59cbbcf am: 73809561df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: Ia6fd283abde3187115627c9e9a91dc4599f5ec56
2021-05-11 08:03:34 +00:00
TreeHugger Robot
6e66ed699b Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e am: 85410254c7 am: 872093e29d am: cd1451ce53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I53e540958fb0c290738a5ac3a1fe6b7a44fb592b
2021-05-11 08:03:14 +00:00
Hugh Chen
0922c78b70 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours am: effac8a0c1 am: ac30bfef8c -s ours am: 7eeee9be6a am: adecb886fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I7f93aeec67dcc83aeff2bba758cd1d5b225a2c3d
2021-05-11 08:03:11 +00:00
Hugh Chen
73809561df [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours am: 392fb7a4f7 am: 0248e7b7cf -s ours am: caf59cbbcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: Id81103bb429caed7c6a7016445f0b8f25f6d5890
2021-05-11 07:33:24 +00:00
TreeHugger Robot
cd1451ce53 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e am: 85410254c7 am: 872093e29d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I930d9febb69b49748f3e570b69b075d7c27710ec
2021-05-11 07:33:14 +00:00
Hugh Chen
adecb886fb [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours am: effac8a0c1 am: ac30bfef8c -s ours am: 7eeee9be6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I91e63235f8d8abe629d5dc2c882509808be4b9fa
2021-05-11 07:33:13 +00:00
TreeHugger Robot
43e9c3e308 Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: cb2b575a9d am: a5d3b8a45c am: 78f4bcf7d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: I96aa3c45ec768dadfac8d681407a2a0f5a5e4295
2021-05-11 07:22:05 +00:00
Hugh Chen
412678bf13 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 am: e914289a2c -s ours am: 810abfc77b am: c6a9224864
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: Ib2e0240bf7a1bf807031c1c647ee523dffcc1e74
2021-05-11 07:22:04 +00:00
Wesley.CW Wang
d8c7606faf Fix color check error am: 7a8d2f4486 am: 58c34f2ce3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493679

Change-Id: Ibbaaf43d9a8fd8f743df820fe2642443387ad304
2021-05-11 07:21:53 +00:00
Hugh Chen
caf59cbbcf [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours am: 392fb7a4f7 am: 0248e7b7cf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I3071e369f5c750e56e7e0d4d5819f2abf7887d5b
2021-05-11 07:07:21 +00:00
TreeHugger Robot
872093e29d Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e am: 85410254c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I910069997b36967f62986543d99a4a7c822aae68
2021-05-11 07:07:12 +00:00
Hugh Chen
7eeee9be6a [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours am: effac8a0c1 am: ac30bfef8c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I3433db790942e4b64ee00dbfe6636a2fbfd53841
2021-05-11 07:07:10 +00:00
TreeHugger Robot
78f4bcf7d8 Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: cb2b575a9d am: a5d3b8a45c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: I57a8a5ea80fe5c154de04944d36b19c2fcbe5d31
2021-05-11 07:00:20 +00:00
Hugh Chen
c6a9224864 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 am: e914289a2c -s ours am: 810abfc77b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: I9719be9db53236fe9c5960bc06ed9341aedff94c
2021-05-11 07:00:19 +00:00
Wesley.CW Wang
58c34f2ce3 Fix color check error am: 7a8d2f4486
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493679

Change-Id: I5d140970c335d8f55ac1102fd64d00b0850463fb
2021-05-11 07:00:04 +00:00
Hugh Chen
0248e7b7cf [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours am: 392fb7a4f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I2dd1a71af29c8f1f680d0d7339a1b29cb7c75240
2021-05-11 06:51:44 +00:00
TreeHugger Robot
85410254c7 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I84c496c66f968a2d4efac98aa2db61723db228b9
2021-05-11 06:51:36 +00:00
Hugh Chen
ac30bfef8c [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours am: effac8a0c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I6e234e32dc4c51a3fd4bccdf8bce71a0fe65577d
2021-05-11 06:51:35 +00:00
TreeHugger Robot
a5d3b8a45c Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: cb2b575a9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: Ieff4517231297944d0e8ea8234863944b38e4aa2
2021-05-11 06:41:34 +00:00
Hugh Chen
810abfc77b [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 am: e914289a2c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: I69468fc4b6059967865fe3f0aa7f003d5b56914b
2021-05-11 06:41:32 +00:00
Hugh Chen
392fb7a4f7 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I2afcbd48ae913e348764246122dc0f0fef03ec46
2021-05-11 06:32:11 +00:00
TreeHugger Robot
16e8c4783e Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I474d15a6db416860a5a34253a7a0ed000912bafc
2021-05-11 06:32:04 +00:00
Hugh Chen
effac8a0c1 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: Ib65fe3dd30eb3dd84a2f4949de6eaa32f2b24146
2021-05-11 06:32:02 +00:00
Hugh Chen
3607e825b9 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I223f7a495fa5640217ee7de19a24fa6490918336
2021-05-11 06:24:06 +00:00
Hugh Chen
8a4f60b143 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I44435d83016a9c974d704cab9de7fa50df1515f3
2021-05-11 06:18:35 +00:00
TreeHugger Robot
cb2b575a9d Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: Iaf718af21458079e30afc205e0888bb7e1da58ca
2021-05-11 06:18:12 +00:00
Hugh Chen
e914289a2c RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: I5c756e1ae08c73f8a20ceacb106eb51b9cc3267b
2021-05-11 06:18:11 +00:00
TreeHugger Robot
54f47d0953 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I4a4c7bd80496a8fa883c895080d4d4c48a3fa3e9
2021-05-11 06:16:43 +00:00
Hugh Chen
7b05629834 RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I7256d5f30d6c4b3063181a768b5d3796cf517383
2021-05-11 06:16:42 +00:00
TreeHugger Robot
f45fa1bf85 Merge changes Ia51528f2,Id27a7809 into rvc-dev
* changes:
  RESTRICT AUTOMERGE Fix unable to send file via OPP
  RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
2021-05-11 06:03:28 +00:00
TreeHugger Robot
4074cd5e48 Merge changes Ia51528f2,Id27a7809 into qt-dev
* changes:
  RESTRICT AUTOMERGE Fix unable to send file via OPP
  RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
2021-05-11 06:03:19 +00:00
Wesley.CW Wang
7a8d2f4486 Fix color check error
Bug: 187772407
Test: make SettingsRoboTests; repo upload
Change-Id: Ia1c89864043d201e8c7a180c9087a56e6f4ca235
2021-05-11 13:21:38 +08:00
YUKAI HUNG
91d9b370e1 Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev am: 7a678f29b2 am: 16fe59dab7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486919

Change-Id: Idee5d47d7440e9f39d5de873413d3aa1869a2405
2021-05-11 04:21:27 +00:00
YUKAI HUNG
16fe59dab7 Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev am: 7a678f29b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486919

Change-Id: I7cef4dd0725ed2fe30ab23806a27ede46add4b70
2021-05-11 04:06:17 +00:00
YUKAI HUNG
7a678f29b2 Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev 2021-05-11 03:47:58 +00:00
Jason Chiu
b22d9bdb0e Merge "Apply the new search bar background color" into sc-dev am: 0c2fa9cd69 am: ad838712ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441412

Change-Id: I8b6ffc80e01b77a40d5931a423f8600ed7cbb674
2021-05-11 03:13:16 +00:00
Jason Chiu
ad838712ed Merge "Apply the new search bar background color" into sc-dev am: 0c2fa9cd69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441412

Change-Id: I12fb430c12a6409e770108a0cf5f7448fad5a14e
2021-05-11 02:57:36 +00:00
Jason Chiu
0c2fa9cd69 Merge "Apply the new search bar background color" into sc-dev 2021-05-11 02:42:08 +00:00
Wesley Wang
3d615d4e16 Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev am: e19d238d18 am: c06523741c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486918

Change-Id: Id242d32c6f35e9301bf27aa229bb5f27ca8e2b7c
2021-05-10 17:34:43 +00:00
Wesley Wang
2e663eb5e9 Merge "Update battery usage summary" into sc-dev am: 56488ef84b am: d591642bb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486916

Change-Id: I348da0b49153cb3d35d9d0a61760decb4b43e8cf
2021-05-10 17:34:14 +00:00
Wesley Wang
c06523741c Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev am: e19d238d18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486918

Change-Id: I9e5f1c75d9eac0bce0b4ca7582362d6154d1a48b
2021-05-10 17:19:08 +00:00
Wesley Wang
d591642bb7 Merge "Update battery usage summary" into sc-dev am: 56488ef84b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486916

Change-Id: I13035b036a2ad7956506d217edd22375b5a74d39
2021-05-10 17:18:31 +00:00
Wesley Wang
e19d238d18 Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev 2021-05-10 17:01:28 +00:00
Wesley Wang
56488ef84b Merge "Update battery usage summary" into sc-dev 2021-05-10 17:00:07 +00:00
Julia Reynolds
aef5f6adce Merge "Handle NLS metadata when provided as strings" into sc-dev am: 333b68d059 am: 9936e10d1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470497

Change-Id: Icb677001b96709d18e1298428cdbc93a64b88e83
2021-05-10 16:20:56 +00:00
Julia Reynolds
9936e10d1e Merge "Handle NLS metadata when provided as strings" into sc-dev am: 333b68d059
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470497

Change-Id: Ia5229cbf3410aed9029d767a322f85ecb65df729
2021-05-10 15:59:02 +00:00
Julia Reynolds
333b68d059 Merge "Handle NLS metadata when provided as strings" into sc-dev 2021-05-10 15:56:35 +00:00
ykhung
4645fef6ca Add searchable keywords for new usage and adaptive preferences screen
Bug: 185432878
Bug: 185433678
Bug: 185855057
Test: make SettingsRoboTests
Change-Id: Ibca47e7732f72cba03fbfae10075ac83f1938b43
2021-05-10 15:40:14 +00:00
TreeHugger Robot
fcfd177aad Merge "Fix work profile setting appearing too often" into sc-dev am: 9cb5ab3860 am: 82ddd0b57e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470515

Change-Id: I3713e87abbdece69d4bafb65a946144ef20df3f3
2021-05-10 14:01:14 +00:00
TreeHugger Robot
82ddd0b57e Merge "Fix work profile setting appearing too often" into sc-dev am: 9cb5ab3860
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470515

Change-Id: Ide92d00f9619dfa7cab8427f0d84f03af4a0993b
2021-05-10 13:45:22 +00:00