Commit Graph

85490 Commits

Author SHA1 Message Date
TreeHugger Robot
300a8f7cf7 Merge "Apply sliding transition for lock screen" into sc-dev am: 9018434111 am: 154e668da7 am: bb3dce8c9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702760

Change-Id: I6c4c1e62a0de143eadd861ff31590ff10e0bdd52
2021-05-26 11:54:15 +00:00
TreeHugger Robot
66760d5db2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a75a0302cc -s ours am: 37947fc40c -s ours am: 0e9522b076 -s ours am: 31fb6a2bac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I170b10dcc213405e45a11dbc9f27e034158f0100
2021-05-26 11:54:09 +00:00
Bill Yi
59038032f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59ac543b64 -s ours am: 1474e88ef3 -s ours am: b00c1efc8e -s ours am: 6ddd7ad01f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7325fbf48d5375451b76271e60c8e14fa28f0db7
2021-05-26 11:54:04 +00:00
TreeHugger Robot
5ee48c8ee5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 64d9cc56c6 -s ours am: f556c56609 -s ours am: 9065eb3210 -s ours am: ef90b54883 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I97e658d619e4f5ca8bb02dc394cd6ddb1c612a59
2021-05-26 11:53:59 +00:00
Bill Yi
9626e77c0e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57f6bc1df -s ours am: 9769c467a3 -s ours am: 046a9c0cf4 -s ours am: 2db38749b8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I74c931c81510dc569fd25a2c7d1ef2463a828c0a
2021-05-26 11:53:54 +00:00
TreeHugger Robot
a820c5cd39 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00764f15b6 -s ours am: ae2b2f8b49 -s ours am: e38629984e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic9ea6bf9d7376edd5ec2043f3b99da27d2d279b6
2021-05-26 11:53:47 +00:00
TreeHugger Robot
8fd8f467ff Merge "Update fonts & colors" into sc-dev am: bdd98ec216 am: 84a7d602f5 am: b6194a0a6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702067

Change-Id: Ic5d5b901649900d155940fd50dbd48ec56c9cf09
2021-05-26 11:53:42 +00:00
TreeHugger Robot
b012902466 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2baf80f3a1 -s ours am: a17ed53f3a -s ours am: 175dc29f82 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie791b1c59eabfff5e063c32369accec58da1e696
2021-05-26 11:53:36 +00:00
Yanting Yang
8c90886ae5 Merge "Remove silky flag from Notifications for official release" into sc-dev am: ed671ebe6c am: b3ce2ff016 am: ab6138d428
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716192

Change-Id: Ifa579e92b404d9653dc79125ef25fcd02389593e
2021-05-26 11:53:30 +00:00
Jernej Virag
0b25a7d88a Merge "Add a setting to enable or disable corner invocation of assistant app" into sc-dev am: 1baf9a867e am: e26626e29c am: 1313c0dd3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502326

Change-Id: Iadc78c3eaa0f7e720e705dbe7d2ab0cbc0a19e10
2021-05-26 11:45:51 +00:00
TreeHugger Robot
a15e88e53c Merge "Suppress shared axis transition on Brightness level" into sc-dev am: b2a97fb735 am: 8b5566614f am: 053c22a2a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682964

Change-Id: Id46ea85d24eee69d4123b85cfb717e9cc4b52d96
2021-05-26 11:45:18 +00:00
Yanting Yang
dd65aa3faa Merge "Remove Advanced section" into sc-dev am: 5dede180cd am: 2d7a5d1fe9 am: db776cb416
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716191

Change-Id: I6bf4b71d63712f76cad9a79a1e773c63cf8d648f
2021-05-26 11:45:10 +00:00
TreeHugger Robot
86f4e4dc50 Merge "Simplify the transition logic." into sc-dev am: 5b24943b06 am: cd82b94eff am: c7d1192ebb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716099

Change-Id: I4568cd1ae6d5ae639827e70144f083062f731d39
2021-05-26 11:45:03 +00:00
Automerger Merge Worker
709b855777 Merge "Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev am: 4f9d0f4eb4 am: 9e9c2508bf" into sc-v2-dev-plus-aosp am: e959cc554f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730711

Change-Id: Icf4d8d743fe6fef9949402dddb961d653032e2c0
2021-05-26 11:35:34 +00:00
TreeHugger Robot
bef59d99c8 Merge "Support different types of transitions." into sc-dev am: 332ee0f374 am: 49d0153039 am: 1777269c87
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682961

Change-Id: I647ee6a28a691132f5d5b49f0d01d4c72b86446d
2021-05-26 11:30:43 +00:00
TreeHugger Robot
bb3dce8c9b Merge "Apply sliding transition for lock screen" into sc-dev am: 9018434111 am: 154e668da7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702760

Change-Id: Ied3db84867c9908fcdfabe2d6baa72b86691ba1a
2021-05-26 11:19:30 +00:00
TreeHugger Robot
31fb6a2bac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a75a0302cc -s ours am: 37947fc40c -s ours am: 0e9522b076 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic68ee67ed19d374595195ee2fce11dccfbf4af03
2021-05-26 11:19:03 +00:00
Bill Yi
6ddd7ad01f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59ac543b64 -s ours am: 1474e88ef3 -s ours am: b00c1efc8e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6eb6f906fdcb721e16e3e7740a79c5fcb79adef0
2021-05-26 11:18:48 +00:00
TreeHugger Robot
ef90b54883 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 64d9cc56c6 -s ours am: f556c56609 -s ours am: 9065eb3210 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I161fb08d6011d54db61298575c0d55658bc791eb
2021-05-26 11:18:17 +00:00
Bill Yi
2db38749b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57f6bc1df -s ours am: 9769c467a3 -s ours am: 046a9c0cf4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I68c99738ff14aec272ae3b95764ad1aa5513f101
2021-05-26 11:17:59 +00:00
TreeHugger Robot
e38629984e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00764f15b6 -s ours am: ae2b2f8b49 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f8566e696824757e9537555be1e50592baab6a0
2021-05-26 11:17:32 +00:00
TreeHugger Robot
b6194a0a6d Merge "Update fonts & colors" into sc-dev am: bdd98ec216 am: 84a7d602f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702067

Change-Id: I1fd37bcd59631ab7f8424088ba476d4db4242c22
2021-05-26 11:17:13 +00:00
TreeHugger Robot
175dc29f82 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2baf80f3a1 -s ours am: a17ed53f3a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifd0d4b4721467dc2d48d089c1407ba636882de35
2021-05-26 11:17:09 +00:00
Yanting Yang
ab6138d428 Merge "Remove silky flag from Notifications for official release" into sc-dev am: ed671ebe6c am: b3ce2ff016
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716192

Change-Id: I685844009b94278ce193ed70228a05f3a36dae1b
2021-05-26 11:15:12 +00:00
Jernej Virag
1313c0dd3a Merge "Add a setting to enable or disable corner invocation of assistant app" into sc-dev am: 1baf9a867e am: e26626e29c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502326

Change-Id: Ic9deaccc9b197500129f12c23d4d8884a67d5fd9
2021-05-26 11:14:53 +00:00
TreeHugger Robot
053c22a2a8 Merge "Suppress shared axis transition on Brightness level" into sc-dev am: b2a97fb735 am: 8b5566614f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682964

Change-Id: I648c332b1e1355998385cbebcc6a7f89aab68733
2021-05-26 11:13:45 +00:00
Yanting Yang
db776cb416 Merge "Remove Advanced section" into sc-dev am: 5dede180cd am: 2d7a5d1fe9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716191

Change-Id: I6955484711e1d219de54c385c955d0b64c255ea1
2021-05-26 11:12:39 +00:00
TreeHugger Robot
154e668da7 Merge "Apply sliding transition for lock screen" into sc-dev am: 9018434111
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702760

Change-Id: If7f51e788545028384565b3657940027d8173b2f
2021-05-26 11:08:36 +00:00
TreeHugger Robot
0e9522b076 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a75a0302cc -s ours am: 37947fc40c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9737e8a498870b10348ef9b393a65541bdcf35f1
2021-05-26 11:08:31 +00:00
Bill Yi
b00c1efc8e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59ac543b64 -s ours am: 1474e88ef3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3e31c7d283823ea9d67f1630d1e55c38d6e0e5e
2021-05-26 11:08:27 +00:00
TreeHugger Robot
9065eb3210 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 64d9cc56c6 -s ours am: f556c56609 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55f7d48c081e171cb372753cf6ebddc280e5dfe5
2021-05-26 11:08:24 +00:00
Bill Yi
046a9c0cf4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57f6bc1df -s ours am: 9769c467a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia1baf4a60467289081501a1edfe69f8b7230b5ad
2021-05-26 11:08:20 +00:00
TreeHugger Robot
ae2b2f8b49 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00764f15b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9309c17d9aefe484a293ad4256d652e0aee7d552
2021-05-26 11:08:00 +00:00
TreeHugger Robot
84a7d602f5 Merge "Update fonts & colors" into sc-dev am: bdd98ec216
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702067

Change-Id: I720e32099f9cf984eecd3e51e3065f0827018a2a
2021-05-26 11:07:56 +00:00
TreeHugger Robot
a17ed53f3a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2baf80f3a1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If34a9493ed7fbabe2ff784a021a48e6513b6bb64
2021-05-26 11:07:50 +00:00
Yanting Yang
b3ce2ff016 Merge "Remove silky flag from Notifications for official release" into sc-dev am: ed671ebe6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716192

Change-Id: I85fcdffc9b1f67298f03a9055b8bda919c4ac715
2021-05-26 11:07:46 +00:00
Jernej Virag
e26626e29c Merge "Add a setting to enable or disable corner invocation of assistant app" into sc-dev am: 1baf9a867e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502326

Change-Id: If2bbba01418485dec658f11b7ba211f1ce6eb460
2021-05-26 11:07:41 +00:00
TreeHugger Robot
8b5566614f Merge "Suppress shared axis transition on Brightness level" into sc-dev am: b2a97fb735
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682964

Change-Id: Icf4b9f32aa8e0c0d98762d1f6616863bb4607765
2021-05-26 11:07:33 +00:00
Yanting Yang
2d7a5d1fe9 Merge "Remove Advanced section" into sc-dev am: 5dede180cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716191

Change-Id: I0ca163db73e4b451b1be7c8325095db9d20fb31f
2021-05-26 11:07:24 +00:00
TreeHugger Robot
c7d1192ebb Merge "Simplify the transition logic." into sc-dev am: 5b24943b06 am: cd82b94eff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716099

Change-Id: I992f1c528ea4643e9ac13fe72481b8847dbafdd3
2021-05-26 11:01:25 +00:00
Automerger Merge Worker
e959cc554f Merge "Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev am: 4f9d0f4eb4 am: 9e9c2508bf" into sc-v2-dev-plus-aosp 2021-05-26 11:01:20 +00:00
TreeHugger Robot
3b5672415e Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev am: 4f9d0f4eb4 am: 9e9c2508bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730711

Change-Id: I71cf66171c5211375fedb8cf5f4a2667937f02e9
2021-05-26 11:01:17 +00:00
TreeHugger Robot
1777269c87 Merge "Support different types of transitions." into sc-dev am: 332ee0f374 am: 49d0153039
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682961

Change-Id: I8816392867a15914859d10d62e73219319516514
2021-05-26 11:01:13 +00:00
TreeHugger Robot
49d0153039 Merge "Support different types of transitions." into sc-dev am: 332ee0f374
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682961

Change-Id: I57839d47380e9e56f1442f1d51c8254baf2be411
2021-05-26 10:53:30 +00:00
TreeHugger Robot
cd82b94eff Merge "Simplify the transition logic." into sc-dev am: 5b24943b06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716099

Change-Id: Ib9ce328500c32c9e10a31c6e0a7fa0a6aa7e49c0
2021-05-26 10:46:19 +00:00
TreeHugger Robot
9e9c2508bf Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev am: 4f9d0f4eb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730711

Change-Id: Ie358e3e5e591a094a56f94da6957257e1e80ff01
2021-05-26 10:46:02 +00:00
TreeHugger Robot
5b24943b06 Merge "Simplify the transition logic." into sc-dev 2021-05-26 10:45:41 +00:00
TreeHugger Robot
4f9d0f4eb4 Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev 2021-05-26 10:26:20 +00:00
YUKAI HUNG
7045ec0b67 Merge "Disable app usage item if this item is not clickable" into sc-dev am: 7164ec8863 am: 64a11c5a87 am: ff51d80270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702402

Change-Id: Iba420b51045795d8ee9f42a1f030e63e020329f5
2021-05-26 09:52:23 +00:00
TreeHugger Robot
274ac5d14f Merge "Fix the extra speaking in Allow supervision dialog" into sc-dev am: 328de8d98f am: 9035a8f4bb am: 7839e46ba9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694606

Change-Id: I874e07dd128e42d293f43bcf6cfc5539b5293dd9
2021-05-26 09:52:08 +00:00