PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,248 Commits 1 Branch 0 Tags
2907c44badcbe89067c63e9b45c47ed98be2b263
Commit Graph

80248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andras Kloczl
2907c44bad [automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours am: a95829294d -s ours am: 7c4f563b62 -s ours am: fb94b7d113 -s ours am: 4008f54081 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf0bdb7d8591e7a12c5b2be0136d8ccaa1fca5eb
 2021-03-11 12:15:58 +00:00
Andras Kloczl
4008f54081 [automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours am: a95829294d -s ours am: 7c4f563b62 -s ours am: fb94b7d113 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I067bd1ba1abcaa53c4854817a52e98aef6f17660
 2021-03-11 12:02:17 +00:00
TreeHugger Robot
a42f51cca0 Merge "Fix no apps text overlapping with filter bar" into sc-dev am: de9bcbb198 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32cecc6ad780ebfaa999457f88ad6a16194efc5b
 2021-03-11 12:00:44 +00:00
Automerger Merge Worker
47ecc2b6af Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours am: 1d48089aa2 -s ours am: 963c939143 -s ours" into sc-dev am: 17027f55bf -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68d9187f3afbbeb1ed08b5c7dbe4cf763071322d
 2021-03-11 12:00:38 +00:00
Automerger Merge Worker
d3f34850de Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours am: 4f095b1a6b -s ours am: cb10105fe1 -s ours am: 4989788b15 -s ours" into sc-dev am: 8b747a8637 -s ours 
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d5afa80499390f1bd173701d47a2f4e664f0f95
 2021-03-11 12:00:34 +00:00
Andras Kloczl
b296da83f2 [automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c -s ours am: 94872d6be0 -s ours am: f9eacae4a0 -s ours am: 9b6dcc321f -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00a50c775888f87f8d58c48f1278db7959291625
 2021-03-11 12:00:25 +00:00
András Klöczl
6c16fcc212 [automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours am: 28539c02dd -s ours am: e690821501 -s ours am: fca809b408 -s ours am: a8dc64691b -s ours am: 203585f40d -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36ba457f3b52fd3fd42b586c56f3961d676acf08
 2021-03-11 12:00:11 +00:00
Automerger Merge Worker
3594e60694 Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 07e414017c am: 0e9cbfc86e -s ours" into sc-dev am: 638a96896e -s ours 
am skip reason: Change-Id I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6aa8f783244a8c703f68fc7256f12bde0c4939c3
 2021-03-11 11:59:50 +00:00
Andras Kloczl
5fc07a4908 [automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours am: a95829294d -s ours am: 7ed616c466 -s ours am: 73f14dcdf2 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6998c5c1856ae23bd321b203df09c9add966a3c
 2021-03-11 11:59:45 +00:00
Andras Kloczl
0292274e88 [automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours am: 6355d222cd -s ours am: 5133ac1f70 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4ffc2949b8efd627dbd2326ea8453bdcffe0a2f
 2021-03-11 11:58:59 +00:00
Andras Kloczl
c555363b82 [automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c am: 7f3b720d75 -s ours am: d065d46ab9 -s ours 
am skip reason: Change-Id I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae65a15619ddb75d43f891627272ee6a0b648935
 2021-03-11 11:57:59 +00:00
Andras Kloczl
fb94b7d113 [automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours am: a95829294d -s ours am: 7c4f563b62 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf18ccc315b62ea33a38e5786b3962d1da50635f
 2021-03-11 11:36:57 +00:00
TreeHugger Robot
de9bcbb198 Merge "Fix no apps text overlapping with filter bar" into sc-dev 2021-03-11 11:18:19 +00:00
Automerger Merge Worker
17027f55bf Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours am: 1d48089aa2 -s ours am: 963c939143 -s ours" into sc-dev 2021-03-11 11:05:06 +00:00
Automerger Merge Worker
8b747a8637 Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours am: 4f095b1a6b -s ours am: cb10105fe1 -s ours am: 4989788b15 -s ours" into sc-dev 2021-03-11 11:05:02 +00:00
Andras Kloczl
e8a52ca61d [automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours am: 1d48089aa2 -s ours am: 963c939143 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib888b7720c7f5cea953f0a10b0fdba3d525f637c
 2021-03-11 11:05:01 +00:00
Andras Kloczl
5a35753e22 [automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours am: 4f095b1a6b -s ours am: cb10105fe1 -s ours am: 4989788b15 -s ours 
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4c8416cc204cdc47b5c321f0489e0b16e4537e7
 2021-03-11 11:04:57 +00:00
Andras Kloczl
9b6dcc321f [automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c -s ours am: 94872d6be0 -s ours am: f9eacae4a0 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf579ecf5584d3e801f3abe6affc3a087b47527e
 2021-03-11 11:04:55 +00:00
András Klöczl
203585f40d [automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours am: 28539c02dd -s ours am: e690821501 -s ours am: fca809b408 -s ours am: a8dc64691b -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89c90cfd7805700a5bdc957594280ee511eb9690
 2021-03-11 11:04:49 +00:00
Automerger Merge Worker
638a96896e Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 07e414017c am: 0e9cbfc86e -s ours" into sc-dev 2021-03-11 11:04:46 +00:00
Andras Kloczl
61bfba4ebd [automerger skipped] Prevent using invalid result uri during multi user image change am: 07e414017c am: 0e9cbfc86e -s ours 
am skip reason: Change-Id I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9747b01a4e5bf509be2f37b613832ba76d69e8e1
 2021-03-11 11:04:41 +00:00
Andras Kloczl
73f14dcdf2 [automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours am: a95829294d -s ours am: 7ed616c466 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a2c840e5b840a9fc8bd7ff10844baa78ae5c299
 2021-03-11 11:04:40 +00:00
Andras Kloczl
5133ac1f70 [automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours am: 6355d222cd -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50645dca96e12c459ea9dd65b35cf7c0d9643fdd
 2021-03-11 11:04:33 +00:00
Andras Kloczl
4989788b15 [automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours am: 4f095b1a6b -s ours am: cb10105fe1 -s ours 
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85edfd864b3d25d5616f65e0b78c630800b8ba7b
 2021-03-11 11:04:11 +00:00
András Klöczl
a8dc64691b [automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours am: 28539c02dd -s ours am: e690821501 -s ours am: fca809b408 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7dcea0dea2ecbdfd2f997801f8003ae347f49b9b
 2021-03-11 11:04:03 +00:00
Andras Kloczl
7ed616c466 [automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours am: a95829294d -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53017d6891c267f1023198cd5e53887d15c30aeb
 2021-03-11 11:03:54 +00:00
Andras Kloczl
d065d46ab9 [automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c am: 7f3b720d75 -s ours 
am skip reason: Change-Id I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf25ad74a40c868f9b02bbf2f0de1b915f7ee68a
 2021-03-11 11:03:12 +00:00
Andras Kloczl
cb10105fe1 [automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours am: 4f095b1a6b -s ours 
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I668e9b33db1da19a9c8f3962df55354887d07309
 2021-03-11 10:59:57 +00:00
András Klöczl
fca809b408 [automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours am: 28539c02dd -s ours am: e690821501 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb18b517ec93e78c3a32d2276948703764387350
 2021-03-11 10:59:37 +00:00
Andras Kloczl
7c4f563b62 [automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours am: a95829294d -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c849158caa489631927a805e3891a623213beeb
 2021-03-11 10:59:34 +00:00
Andras Kloczl
4f095b1a6b [automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours 
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If83710ea2b67104d3f3cbc1ce55f32ed129770cf
 2021-03-11 10:42:24 +00:00
András Klöczl
e690821501 [automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours am: 28539c02dd -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2052e3022c61172aac54fb1855d500eb3f0755a
 2021-03-11 10:42:15 +00:00
Andras Kloczl
a95829294d [automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4017e71f1c6b9f6a1eee1cde5d8c3534fa4a4ed5
 2021-03-11 10:42:06 +00:00
Andras Kloczl
6355d222cd [automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I745498eef55d159e98e6d1b2d549fc20a05c59e4
 2021-03-11 10:28:59 +00:00
Andras Kloczl
b21072b773 [automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours 
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41fd0e7c9aaef6aa0f4d0784ba916612f95e89dc
 2021-03-11 10:28:53 +00:00
Andras Kloczl
7f3b720d75 Prevent using invalid result uri during multi user image change am: e36357b20c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815797

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1a8977045597d896bd58ace3f2319aefbd86858
 2021-03-11 10:28:52 +00:00
András Klöczl
28539c02dd [automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4bfc7671ae0401b97ec24b32c53146926490809f
 2021-03-11 10:28:43 +00:00
Andras Kloczl
963c939143 [automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours am: 1d48089aa2 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7025da5c224cb2f0ce92e31e8b3f9645c588701
 2021-03-11 10:24:42 +00:00
Andras Kloczl
f9eacae4a0 [automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c -s ours am: 94872d6be0 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 07e414017c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1081ba90dd6e3b49489237b60ac14496ec419617
 2021-03-11 10:24:33 +00:00
Andras Kloczl
94ed37dacf [automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours 
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7e57866c554495b9f8fd8b48b9c03ccde9f8160
 2021-03-11 10:24:31 +00:00
Andras Kloczl
1d48089aa2 [automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad298e6c9211ca2af4ba36be3d6b40cc634e3394
 2021-03-11 10:24:30 +00:00
Andras Kloczl
c40b15712c [automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I155c9ce1031960174f802c15102d3c2a3619bfb6
 2021-03-11 10:24:25 +00:00
Andras Kloczl
0e9cbfc86e Prevent using invalid result uri during multi user image change am: 07e414017c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98dd17745edd2e700169959537e640a33b81e07b
 2021-03-11 10:24:24 +00:00
Andras Kloczl
94872d6be0 [automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 07e414017c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58a14824bee13043f07ced00fd31bae1a6d14526
 2021-03-11 10:24:19 +00:00
Andras Kloczl
373b53a7cc [automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours 
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c374ecf934e3356f6d656908dab6f02ab215763
 2021-03-11 10:24:17 +00:00
András Klöczl
f1125282f9 Merge "Prevent using invalid result uri during multi user image change" into pi-dev 2021-03-11 09:48:07 +00:00
TreeHugger Robot
b69b44aae7 Merge "Declare activities for factory reset pages" into sc-dev am: 4082b27b0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824395

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If045f08e6885eeebea99a8beacd4abb3d8894d73
 2021-03-11 09:43:38 +00:00
TreeHugger Robot
4082b27b0a Merge "Declare activities for factory reset pages" into sc-dev 2021-03-11 09:05:58 +00:00
Mill Chen
b0548113d2 Fix no apps text overlapping with filter bar 
Since Settings UI has been changed and the filter bar will be staying
in a fixed place, the "no apps" text will be overlapped with filter bar.
To make the text seperate from filter bar, the string will be put
in the bottom of text view.

Fixes: 182173848
Test: visual verified
1) Settings -> Notifications -> See all from last 7 days -> select
Turned off on filter bar
2) Observe and see if the "no apps" is overlapping with filter bar

Change-Id: Ib99bb5122fb72f05a2404b8f61b025a46d6d53dd
 2021-03-11 16:44:48 +08:00
Wesley Wang
54b58b9a97 Merge "Update UsageProgressBarPref icon when device is charging or low battery" into sc-dev am: 1d5d101aa6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id96b38dce8a4dc895bbd2263df16c17294bf0fa4
 2021-03-11 08:07:53 +00:00