Bill Yi
f9cf7d32ec
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c
-s ours am: 35632cb1c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: I2e7ca6f0d84fd0f4606f76f2aace8e7968710c0b
2020-07-14 16:05:13 +00:00
Bill Yi
2580a067e1
[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: Ic80d575d02bc7a2886b527c3fa4fa8886b68c21f
2020-07-14 16:05:07 +00:00
Bill Yi
0e7fdac130
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c
-s ours am: 35632cb1c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: I2689b64d28c8959cf3f61d31ebca5bdcb610a6ea
2020-07-14 16:05:02 +00:00
Bill Yi
d3265e35db
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Id91d7e77943acb2d0b08d64615b20da8577ecf83
2020-07-14 16:04:59 +00:00
Bill Yi
182290e9b8
[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: If81c15739006a0e476938a21e5739163f07ad565
2020-07-14 16:04:50 +00:00
Bill Yi
35632cb1c2
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Id35fed36fc4331df55138a82a2f4ead80d7c5d4a
2020-07-14 16:04:49 +00:00
Andras Kloczl
57154fbac3
Fix multi user crash when Add guest was tapped multiple times
...
When "Add guest" got tapped multiple times then the first click starts
the guest creation process which blocks the UI thread for around 2-3
seconds, then triggers the open guest details intent, and the second
tap event starts another guest creation, but it fails (since there
can't be more than 1 guest on the device) and returns null, and in the
openUserDetails we get NullPointerException.
Test: manual test
Video: http://shortn/_i4Dce33yhl
Bug: 160267016
Change-Id: I9a4f0a91295e336d246abe5f5470682a14cb510f
2020-07-14 14:34:57 +01:00
Bill Yi
289d2bf059
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: If55c745f90b6527fc1e0cf1d570ee0e2463b68a6
2020-07-14 06:25:04 -07:00
Bill Yi
a58e5de4c9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I3d7b397ba8a39c5f6a7ac75e0fa505be39b48775
2020-07-14 04:13:50 -07:00
Bill Yi
2532f0b32c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I30a4580a86030d499cdaa42ee082af185543ee6d
2020-07-14 02:03:30 -07:00
TreeHugger Robot
29aad71c6e
Merge "Restore original importance when unblocking notif channel" into rvc-qpr-dev am: 8fca94f56c
am: 8870591ab3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139829
Change-Id: If460eff74cfc509c5e49bf98f1742a1de187805d
2020-07-14 00:01:36 +00:00
Julia Reynolds
a00e6960ea
Update font family am: 1a44a98f34
am: 63a9f32547
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139828
Change-Id: I84e1d696e29a2099ed671e83e4c1f579bfd55bd9
2020-07-14 00:01:18 +00:00
TreeHugger Robot
8870591ab3
Merge "Restore original importance when unblocking notif channel" into rvc-qpr-dev am: 8fca94f56c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139829
Change-Id: I3a2a93b4cc2f0e5630f51635cc9313845bb05015
2020-07-13 23:46:24 +00:00
Julia Reynolds
63a9f32547
Update font family am: 1a44a98f34
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139828
Change-Id: I3a4d2eb6abcbf531f94f21c23abe85070f71bd84
2020-07-13 23:46:10 +00:00
TreeHugger Robot
8fca94f56c
Merge "Restore original importance when unblocking notif channel" into rvc-qpr-dev
2020-07-13 23:34:13 +00:00
Julia Reynolds
2700b83c48
Restore original importance when unblocking notif channel
...
Test: atest
Fixes: 62355992
Change-Id: I5d764d0ade68b2ce5708ae79e9ef488ab57bb141
(cherry picked from commit e2a8266328
)
2020-07-13 20:13:43 +00:00
Julia Reynolds
1a44a98f34
Update font family
...
For notification settings, to match the inline settings
Test: manual
Fixes: 153886531
Change-Id: Ie338080bd35a8dc2715330f3b82c272b0be81d54
(cherry picked from commit edb8dd0ec4
)
2020-07-13 20:11:20 +00:00
Automerger Merge Worker
b9035f6bab
Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
am: 03edb83f56" into rvc-d1-dev-plus-aosp am: b1a75b7f66
am: b5ec6fafda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974
Change-Id: I4641201953b949f2c65fbd097971d66a6605d68b
2020-07-13 17:45:12 +00:00
Automerger Merge Worker
8cbd1da319
Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
am: 03edb83f56
am: ffda931026" into rvc-qpr-dev-plus-aosp am: 567afca630
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974
Change-Id: I9d0068dfb4c2a9d1617eb0ee80e8440463c5b0a5
2020-07-13 17:44:33 +00:00
Lucas Dupin
01327140f1
Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
am: 91ba077612
am: 162d505e14
am: 82c3503d1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974
Change-Id: I947c54909a719e97562c69664cdd66a30a7207dc
2020-07-13 17:43:25 +00:00
Automerger Merge Worker
b5ec6fafda
Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
am: 03edb83f56" into rvc-d1-dev-plus-aosp am: b1a75b7f66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974
Change-Id: I541df011c1d6a5a4e9ab2ffa687fd8434d26e691
2020-07-13 17:27:15 +00:00
Automerger Merge Worker
567afca630
Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
am: 03edb83f56
am: ffda931026" into rvc-qpr-dev-plus-aosp
2020-07-13 17:27:04 +00:00
Lucas Dupin
ec9b9a4fd8
Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
am: 03edb83f56
am: ffda931026
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974
Change-Id: I64eff205c0e01330ddeacdcc97e0da304dfbb40a
2020-07-13 17:26:35 +00:00
Lucas Dupin
82c3503d1e
Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
am: 91ba077612
am: 162d505e14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974
Change-Id: I7734d178ac6cbd93a76d258c7edc22434d76ad19
2020-07-13 17:26:32 +00:00
Jiashen Wang
838aa43cc0
Initial setup for slot change receiver migration
...
Initial setup for migrating SlotChangehandler from LPA to Settings
Bug: 160819212
Bug: 153811431
Test: Manually tested on Pixel 4 to make sure SlotChangeReceiver can get
slot change events correctly.
Change-Id: Id95f2db875ba08250f4740536742627500b74f0d
2020-07-13 10:22:04 -07:00
Automerger Merge Worker
b1a75b7f66
Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
am: 03edb83f56" into rvc-d1-dev-plus-aosp
2020-07-13 17:14:03 +00:00
Lucas Dupin
162d505e14
Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
am: 91ba077612
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974
Change-Id: Iebc0844230afdb44868f4f1a6245808aee291dfb
2020-07-13 17:13:42 +00:00
Lucas Dupin
ffda931026
Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
am: 03edb83f56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974
Change-Id: Id71cee5d2db2623b3d66203075d4c34405322bed
2020-07-13 17:13:39 +00:00
Lucas Dupin
b0f831f3e5
Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
am: 03edb83f56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974
Change-Id: Iaaeaf39246920eb1abc651247f5cd8b5787b7d2e
2020-07-13 17:13:32 +00:00
Lucas Dupin
03edb83f56
Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974
Change-Id: I4fc62150f05b1d59bcd77fe7566dd334f1d8931d
2020-07-13 16:55:39 +00:00
Lucas Dupin
91ba077612
Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974
Change-Id: Ie6859a17ba1f1d420f231ba6d9385a48ce442923
2020-07-13 16:55:38 +00:00
Lucas Dupin
9b01b8510a
Merge "Delete media feature flag" into rvc-dev
2020-07-13 16:44:15 +00:00
TreeHugger Robot
7024116829
Merge "Fix test case fail"
2020-07-13 03:42:57 +00:00
timhypeng
b5527e329b
Fix test case fail
...
Bug: 160956047
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib975e906aefc44c59a8465a586832d92664f5147
2020-07-13 10:29:11 +08:00
TreeHugger Robot
d90229ba2e
Merge "Import translations. DO NOT MERGE"
2020-07-11 01:20:50 +00:00
TreeHugger Robot
d673020489
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35
-s ours am: a1bd62eb2e
-s ours am: d10325dd23
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12131136
Change-Id: I04309ba7b4ce75a0f02bd0accb5cee03cf0d2680
2020-07-10 23:19:31 +00:00
TreeHugger Robot
a7f4f39196
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35
-s ours am: 830ca9712d
-s ours am: 2ca966ce1d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12131136
Change-Id: I9e6032cf12ff8729f27424fc83c2d81e1581de71
2020-07-10 23:19:03 +00:00
Bill Yi
f3fa14812c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I40d92298a2a8268cae383b82336b27faa54148aa
2020-07-10 16:16:00 -07:00
TreeHugger Robot
d10325dd23
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35
-s ours am: a1bd62eb2e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12131136
Change-Id: I881da842e0c7c122b40dec21ef9fc704b1de4546
2020-07-10 23:03:44 +00:00
TreeHugger Robot
2ca966ce1d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35
-s ours am: 830ca9712d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12131136
Change-Id: I1782ed6e9152ff153745ba5057b1402e0a90da41
2020-07-10 23:02:57 +00:00
TreeHugger Robot
830ca9712d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12131136
Change-Id: I6bfae0272a2f47e3a0866c2c57550c54e15b90fc
2020-07-10 22:48:06 +00:00
TreeHugger Robot
a1bd62eb2e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12131136
Change-Id: Iee0af28a4ca9f2b681ded43a5a027998b62ed2c2
2020-07-10 22:47:58 +00:00
TreeHugger Robot
8539f2ac35
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-07-10 22:35:54 +00:00
TreeHugger Robot
10b5400c25
Merge "Increase expand/collapse tap target" into rvc-qpr-dev am: 35e0d32d0e
am: b8a8fef548
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12130259
Change-Id: I67ccd275a165f33402af3d2f04243269fe3841dd
2020-07-10 22:25:07 +00:00
TreeHugger Robot
b8a8fef548
Merge "Increase expand/collapse tap target" into rvc-qpr-dev am: 35e0d32d0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12130259
Change-Id: I4998fdace936dc05a40a80ee0602a2c0568607e7
2020-07-10 22:12:12 +00:00
TreeHugger Robot
35e0d32d0e
Merge "Increase expand/collapse tap target" into rvc-qpr-dev
2020-07-10 21:54:53 +00:00
Automerger Merge Worker
6ede7a2404
Merge "[automerger skipped] Import translations. DO NOT MERGE am: d7102ca072
-s ours am: 046179f99d
-s ours am: d76e6deb71
-s ours" into rvc-qpr-dev-plus-aosp am: c756748079
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12129920
Change-Id: I27f1c763938a562de575554b4b8fb5386b32da5e
2020-07-10 21:37:23 +00:00
Automerger Merge Worker
94ce9f4360
Merge "[automerger skipped] Import translations. DO NOT MERGE am: d7102ca072
-s ours am: 24cc569d89
-s ours" into rvc-d1-dev-plus-aosp am: 2e00e85c60
-s ours am: 191f37bf59
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12129920
Change-Id: I76bbb9c61ac3ffac4eae99d1cd23cbcb13d04db2
2020-07-10 21:36:17 +00:00
Bill Yi
23289c92fb
[automerger skipped] Import translations. DO NOT MERGE am: d7102ca072
-s ours am: 046179f99d
-s ours am: d124fd13df
-s ours am: 98e8a034fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12129920
Change-Id: Ic14c100d2b7c57281c1ef4eafa353ab3cf669e51
2020-07-10 21:35:16 +00:00
Automerger Merge Worker
c756748079
Merge "[automerger skipped] Import translations. DO NOT MERGE am: d7102ca072
-s ours am: 046179f99d
-s ours am: d76e6deb71
-s ours" into rvc-qpr-dev-plus-aosp
2020-07-10 21:23:29 +00:00