Commit Graph

71040 Commits

Author SHA1 Message Date
TreeHugger Robot
bc1be06fe1 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: 825fa93316 am: 62746f0d84 am: 1e89d84c06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I0a46f922306ff837a17371e75257787d111b4794
2020-06-08 22:53:31 +00:00
Automerger Merge Worker
9559196cc1 Merge "Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 am: 72f55ee81c" into rvc-qpr-dev-plus-aosp am: 4097433543
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: Ic9803d8451cb8a83deb72910ccde9541259b67d3
2020-06-08 22:53:23 +00:00
TreeHugger Robot
fa00c26f50 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 am: 0a93295af2 am: 84a644b0e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I93976166e73eace442aa4f4323021e3ecb20e275
2020-06-08 22:53:08 +00:00
TreeHugger Robot
1e89d84c06 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: 825fa93316 am: 62746f0d84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: Ic01983978c42ab3a67e2d1ae114832ba233e95f9
2020-06-08 22:38:46 +00:00
Automerger Merge Worker
4097433543 Merge "Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 am: 72f55ee81c" into rvc-qpr-dev-plus-aosp 2020-06-08 22:38:40 +00:00
TreeHugger Robot
93c1c50adb Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 am: 72f55ee81c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I5347ac8b0cba757b8a239dea23e3b28f45c9cc0e
2020-06-08 22:38:33 +00:00
TreeHugger Robot
84a644b0e4 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 am: 0a93295af2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I48b2d735d76f29428842d5659e89516ebf32a891
2020-06-08 22:38:30 +00:00
TreeHugger Robot
62746f0d84 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: 825fa93316
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: Icad25036f76c947dcc84fdede3a8be1a4afbc5fd
2020-06-08 22:26:38 +00:00
TreeHugger Robot
0a93295af2 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: Ia18605f157581a2c1baf9d2fabac9f8f0631243e
2020-06-08 22:26:28 +00:00
TreeHugger Robot
72f55ee81c Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: Id47b6b24ae7930b3b3f22c481ec51a008d59b818
2020-06-08 22:26:28 +00:00
TreeHugger Robot
825fa93316 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I811bbe7d8b1ab864f8af45a60b8e1a919dc08013
2020-06-08 22:15:47 +00:00
TreeHugger Robot
cc2652c5e9 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I9e00ad9c654ce922cd3d10803eabc71b0b6f37c1
2020-06-08 22:15:36 +00:00
TreeHugger Robot
01464a1bff Merge "Fix shortcut flags" into rvc-dev 2020-06-08 22:06:20 +00:00
Nate Myren
a1933458c5 Add new description to Permission manager in settings
Fixes: 158125093
Test: Navigate to "Permission manager" in settings (both in privacy, and
in apps & notifications), and verify the summary says "control app
access to your data".

Change-Id: I43f7f38dde119bad96ec9d30a43129e7cacf752a
2020-06-08 13:43:47 -07:00
Julia Reynolds
6534317317 Fix shortcut flags
Test: view the conversation detail page for a conversation
with a posted notification
Fixes: 158033229

Change-Id: I3c51d9565201cb39a5d76d8aaca75c026e630e51
2020-06-08 16:11:23 -04:00
Treehugger Robot
6dd840715f Merge "Settings performance testing" am: cd85c64362 am: d6d12e558c am: 9a354eac3c am: bf6d85215a am: 73a13afce3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1318235

Change-Id: I03a1f129fad91cfdec9ec57212c061bd03298412
2020-06-08 17:31:32 +00:00
Xin Li
2aed784563 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64d2330914 -s ours am: 71f9ff258a -s ours am: 0bf4f27123 -s ours am: 478b4df6b2 -s ours am: 8b37ae8d14 -s ours
am skip reason: Change-Id I614914b738e3af198fe21b881d2e475e2e8eda41 with SHA-1 cbebca9881 is in history

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

Change-Id: I98f3e0700f3ba4e7ac3770e631e7811817af1181
2020-06-08 17:25:06 +00:00
Treehugger Robot
73a13afce3 Merge "Settings performance testing" am: cd85c64362 am: d6d12e558c am: 9a354eac3c am: bf6d85215a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1318235

Change-Id: I563bd0f5603e47d77928a6c7d31ee0c8ad69b30b
2020-06-08 17:02:30 +00:00
Xin Li
8b37ae8d14 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64d2330914 -s ours am: 71f9ff258a -s ours am: 0bf4f27123 -s ours am: 478b4df6b2 -s ours
am skip reason: Change-Id I614914b738e3af198fe21b881d2e475e2e8eda41 with SHA-1 cbebca9881 is in history

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

Change-Id: If41ba232497c0aaf7fbe5496b09ba7b4a4905e15
2020-06-08 16:42:02 +00:00
Treehugger Robot
bf6d85215a Merge "Settings performance testing" am: cd85c64362 am: d6d12e558c am: 9a354eac3c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1318235

Change-Id: I98a7840f33d8d217ad2d82bd434c8850d8e40ce9
2020-06-08 16:34:53 +00:00
Xin Li
478b4df6b2 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64d2330914 -s ours am: 71f9ff258a -s ours am: 0bf4f27123 -s ours
am skip reason: Change-Id I614914b738e3af198fe21b881d2e475e2e8eda41 with SHA-1 cbebca9881 is in history

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

Change-Id: Ia6ce3e6ce68c37c0cbcf0d31aa44c43e59cc4fd7
2020-06-08 16:29:19 +00:00
Treehugger Robot
9a354eac3c Merge "Settings performance testing" am: cd85c64362 am: d6d12e558c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1318235

Change-Id: I599a60ac2cb6bf475017ef66252df2e9c960829b
2020-06-08 16:19:32 +00:00
Xin Li
0bf4f27123 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64d2330914 -s ours am: 71f9ff258a -s ours
am skip reason: Change-Id I614914b738e3af198fe21b881d2e475e2e8eda41 with SHA-1 cbebca9881 is in history

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

Change-Id: I63768f19313ecdc5ce64eb4a169612b5b55e91a7
2020-06-08 16:08:00 +00:00
Treehugger Robot
d6d12e558c Merge "Settings performance testing" am: cd85c64362
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1318235

Change-Id: I075f1b3774522494f34310f9fa81e8adf7896659
2020-06-08 16:03:31 +00:00
Xin Li
71f9ff258a [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64d2330914 -s ours
am skip reason: Change-Id I614914b738e3af198fe21b881d2e475e2e8eda41 with SHA-1 cbebca9881 is in history

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

Change-Id: Idec7ee3bd2c9166103a124a8e8d006e68e1ac62c
2020-06-08 15:56:45 +00:00
Kholoud Mohamed
8fc0a24bc2 Add extra summary string in cross profiles page
Fixes: 158227594
Test: manual testing
Change-Id: Idd44c690c2a77503173e733a49bc59c1717cbdd5
2020-06-08 16:03:58 +01:00
Stanley Wang
543c9c6f2d Update "yes" string for German language.
Remove the double quote in the string.

Fixes: 156627009
Test: observe the UI
Change-Id: I4659aa88a8f43df2477d5fe7b3dd60869c65f80d
2020-06-08 19:33:51 +08:00
Jakub Pawlowski
2866a5f312 Prevent overlay drawing on top of Bluetooth discovery request dialog am: c48d63752a am: e61467cd6c am: a44860c880 am: 8e5e16de15 am: 56a1f8af20 am: 61ee053e43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484059

Change-Id: Ic0a631c417d403993ace622ea23a860fe4bad233
2020-06-08 07:17:32 +00:00
Jakub Pawlowski
5ab6e17435 Prevent overlay drawing on top of Bluetooth discovery request dialog am: c48d63752a am: e61467cd6c am: a44860c880 am: f900341561 am: 75814c4d67 am: 417aed6cf5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484059

Change-Id: Ia952e068194505e30fa02e5f24d4dfd2495b79df
2020-06-08 07:17:25 +00:00
Jakub Pawlowski
3df0d9af47 Prevent overlay drawing on top of Bluetooth discovery request dialog am: c48d63752a am: e61467cd6c am: a44860c880 am: 8e5e16de15 am: 98836a15d8 am: 42117325d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484059

Change-Id: I5f7e3ca19b87dccde1867b3cd4e2ee8ecd85334e
2020-06-08 07:17:12 +00:00
Treehugger Robot
cd85c64362 Merge "Settings performance testing" 2020-06-08 07:05:23 +00:00
Jakub Pawlowski
61ee053e43 Prevent overlay drawing on top of Bluetooth discovery request dialog am: c48d63752a am: e61467cd6c am: a44860c880 am: 8e5e16de15 am: 56a1f8af20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484059

Change-Id: Ia38e2a1daaf2193128afdecc500f6265289f50e8
2020-06-08 07:01:39 +00:00
Jakub Pawlowski
417aed6cf5 Prevent overlay drawing on top of Bluetooth discovery request dialog am: c48d63752a am: e61467cd6c am: a44860c880 am: f900341561 am: 75814c4d67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484059

Change-Id: I0e4d73fe47aa28332c9975ce9cc262e737615a26
2020-06-08 07:01:18 +00:00
Jakub Pawlowski
42117325d0 Prevent overlay drawing on top of Bluetooth discovery request dialog am: c48d63752a am: e61467cd6c am: a44860c880 am: 8e5e16de15 am: 98836a15d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484059

Change-Id: I14b0fcfe5167c4406dd4e6ebeb182b8021ff5566
2020-06-08 07:01:10 +00:00
Jakub Pawlowski
75814c4d67 Prevent overlay drawing on top of Bluetooth discovery request dialog am: c48d63752a am: e61467cd6c am: a44860c880 am: f900341561
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484059

Change-Id: Ibb24137620c174db8e82232020dfaf998a971387
2020-06-08 06:45:42 +00:00
Jakub Pawlowski
98836a15d8 Prevent overlay drawing on top of Bluetooth discovery request dialog am: c48d63752a am: e61467cd6c am: a44860c880 am: 8e5e16de15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484059

Change-Id: Idbfa4ec0d34c69da85156c45d41717646390af78
2020-06-08 06:45:20 +00:00
Jakub Pawlowski
56a1f8af20 Prevent overlay drawing on top of Bluetooth discovery request dialog am: c48d63752a am: e61467cd6c am: a44860c880 am: 8e5e16de15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484059

Change-Id: I390c50aac9d3d497ea51ef7fc13e6ea28a89889a
2020-06-08 06:45:07 +00:00
Jakub Pawlowski
f900341561 Prevent overlay drawing on top of Bluetooth discovery request dialog am: c48d63752a am: e61467cd6c am: a44860c880
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484059

Change-Id: Id7e13d647b39dcaf514d15e6f8af58df8ada6c1c
2020-06-08 06:27:04 +00:00
Jakub Pawlowski
8e5e16de15 Prevent overlay drawing on top of Bluetooth discovery request dialog am: c48d63752a am: e61467cd6c am: a44860c880
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484059

Change-Id: I62c1f20e1c356284143037088c91c7bc800502bb
2020-06-08 06:26:46 +00:00
Automerger Merge Worker
9351960b7f Merge "Merge "Fix keyboard navigation work in Settings home page" into rvc-dev am: 8a2eb5e8bc am: 6325f17348 am: 266cef3333" into rvc-qpr-dev-plus-aosp am: 9342f152c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686086

Change-Id: I79cf2e8c376c7d8a3f17bd80bf4dc63c804d5024
2020-06-08 06:12:58 +00:00
Automerger Merge Worker
e02679c6bc Merge "Merge "Fix keyboard navigation work in Settings home page" into rvc-dev am: 8a2eb5e8bc am: 5520cb90ac am: e821924378" into rvc-qpr-dev-plus-aosp am: 95c398bbaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686086

Change-Id: I4a1743077a10e5ede27997c26c2747a46fbddd23
2020-06-08 06:12:48 +00:00
TreeHugger Robot
d355d90e33 Merge "Fix keyboard navigation work in Settings home page" into rvc-dev am: 8a2eb5e8bc am: 5520cb90ac am: 90b6007026 am: bb4d54020f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686086

Change-Id: Ia5f3ae9b95cecdc22683505c62c1b19c70179b2a
2020-06-08 06:12:36 +00:00
Jakub Pawlowski
a44860c880 Prevent overlay drawing on top of Bluetooth discovery request dialog am: c48d63752a am: e61467cd6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484059

Change-Id: Ib9bde83d8d0d5a81dcde8d7d6723a51d55663610
2020-06-08 06:12:33 +00:00
Automerger Merge Worker
7a346bd4f9 Merge "Merge "Add a new method to set state description" into rvc-d1-dev am: 7d31298291 am: 2ff5b190af" into rvc-qpr-dev-plus-aosp am: 89684398c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11749642

Change-Id: I73098937126105caa73a5a838c8b41d7e8f1ef9e
2020-06-08 06:12:28 +00:00
TreeHugger Robot
fcde9d77c4 Merge "Add a new method to set state description" into rvc-d1-dev am: 7d31298291 am: be5a74a808 am: 37d36a2b97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11749642

Change-Id: I5358af7056ea056a983aaab5d37acf12b1cd8b19
2020-06-08 06:12:07 +00:00
Automerger Merge Worker
9342f152c7 Merge "Merge "Fix keyboard navigation work in Settings home page" into rvc-dev am: 8a2eb5e8bc am: 6325f17348 am: 266cef3333" into rvc-qpr-dev-plus-aosp 2020-06-08 06:00:26 +00:00
Automerger Merge Worker
95c398bbaf Merge "Merge "Fix keyboard navigation work in Settings home page" into rvc-dev am: 8a2eb5e8bc am: 5520cb90ac am: e821924378" into rvc-qpr-dev-plus-aosp 2020-06-08 06:00:21 +00:00
TreeHugger Robot
e5f926e36e Merge "Fix keyboard navigation work in Settings home page" into rvc-dev am: 8a2eb5e8bc am: 6325f17348 am: 266cef3333
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686086

Change-Id: Ifee31b2d19bdbd3594ce99e7daa81c488e8b0889
2020-06-08 06:00:21 +00:00
TreeHugger Robot
ec4bff1a81 Merge "Fix keyboard navigation work in Settings home page" into rvc-dev am: 8a2eb5e8bc am: 5520cb90ac am: e821924378
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686086

Change-Id: I6fd056298778b2123520b1b6b8a5743c3b95e148
2020-06-08 06:00:16 +00:00
TreeHugger Robot
bb4d54020f Merge "Fix keyboard navigation work in Settings home page" into rvc-dev am: 8a2eb5e8bc am: 5520cb90ac am: 90b6007026
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11686086

Change-Id: I99b1bbbce5f8415c667fac74e2ef7d3918776b44
2020-06-08 06:00:15 +00:00