Automerger Merge Worker
7ab944018e
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: Iec7e92e51ebb810329b65598fb09ccef27779e5a
2021-03-11 11:59:40 +00:00
Andras Kloczl
2c2c565c37
[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: I2a83409801af9cabf27e04d8713fc6eab0adf0d3
2021-03-11 11:59:27 +00:00
Andras Kloczl
f436ab1d9e
[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: Icc470c0a5aed7c65f7aa8f847772ffaa84494e68
2021-03-11 11:59:21 +00:00
Andras Kloczl
8d009addd3
[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: I931c66e09c4343b3699d40d8554d93a78018de05
2021-03-11 11:57:29 +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
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
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
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
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
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
TreeHugger Robot
f0d24233f1
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: I2cde51bdfb43c1136d92a383bc4af22fd3861f4a
2021-03-11 09:44:03 +00:00
TreeHugger Robot
4082b27b0a
Merge "Declare activities for factory reset pages" into sc-dev
2021-03-11 09:05:58 +00:00
Wesley Wang
01b6e1ce75
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: I40a037738f63e001f6d4a19332e905b6e3820d6c
2021-03-11 08:08:00 +00:00
Arc Wang
0506094439
Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: 3d1658e93d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824398
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0c2f37eec1d4b488627097378ee83906c2a9db83
2021-03-11 08:07:53 +00:00
Wesley Wang
1d5d101aa6
Merge "Update UsageProgressBarPref icon when device is charging or low battery" into sc-dev
2021-03-11 07:53:12 +00:00
Arc Wang
3d1658e93d
Merge "Hide non-system overlay window on ActivityPicker" into sc-dev
2021-03-11 07:45:43 +00:00
TreeHugger Robot
9cf40e8d6b
Merge "Use title area for enrollment error messages" into sc-dev am: 53d7495162
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824391
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I125b8f9f58f22baad3779d1b027e852087d9e170
2021-03-11 06:44:56 +00:00
Wesley.CW Wang
e940dcb448
Update UsageProgressBarPref icon when device is charging or low battery
...
- Add new icon for battery low state
- Update UsageProgressBarPref icon when charging or low battery
Screenshots:
https://screenshot.googleplex.com/9HBvV6t6dVsG8eD.png
https://screenshot.googleplex.com/6TsRu6BTN338FvT.png
https://screenshot.googleplex.com/nGE29cfsmgKuuaP.png
https://screenshot.googleplex.com/85NWXSg2PevXAsy.png
Bug: 179237746
Test: make RunSettingsRoboTests -j40
Change-Id: I057874bbf45594c90466cf346b054bf033815dac
2021-03-11 06:32:20 +00:00
TreeHugger Robot
53d7495162
Merge "Use title area for enrollment error messages" into sc-dev
2021-03-11 06:16:42 +00:00
Yi Jiang
c5240330fb
Merge "Fixes UI style issues in Screen Timeout setting" into sc-dev am: 5c11109ffc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13828187
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4171acbe3d433a5be7978fae1d9c8d36b6fb5407
2021-03-11 05:13:55 +00:00
Yi Jiang
5c11109ffc
Merge "Fixes UI style issues in Screen Timeout setting" into sc-dev
2021-03-11 04:48:04 +00:00
Arc Wang
3b4853e109
Hide non-system overlay window on ActivityPicker
...
To improve security.
Bug: 181962311
Test: manual
Show an AlertDialog and observe if it will hide after below command.
adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I6e2845cc19dc012cba2933318a067bbb8db90a23
2021-03-11 12:10:18 +08:00
Treehugger Robot
d93df9f4d3
Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f am: eda1be644f am: 2817c677b1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie5e51949f4aef78f1d4c7beb79b40b311c3f1ab1
2021-03-11 03:56:29 +00:00
Treehugger Robot
2817c677b1
Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f am: eda1be644f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I755a0f00c44dfd39b84e4f843a1553de2e8850a2
2021-03-11 03:23:22 +00:00
Treehugger Robot
eda1be644f
Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I80ebc15814491a28b3da23b6554b81022ab49db3
2021-03-11 02:41:39 +00:00
Kevin Chyn
f8cb470bdf
Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev am: 13b05b6fb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13820985
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife8335f1b85e773b7f6cb2bd567d7b8657ae000a
2021-03-11 01:49:40 +00:00
Kevin Chyn
ae931bf46f
Update revokeChallenge together with frameworks/base am: e91e39b604
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13818078
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4e624f56b1b653034bb4ebb48fd09564a7099305
2021-03-11 01:49:37 +00:00
Kevin Chyn
13b05b6fb8
Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev
...
* changes:
Update fingerprint revokeChallenge with frameworks/base
Update revokeChallenge together with frameworks/base
2021-03-11 01:14:15 +00:00
Treehugger Robot
dac69ccd8f
Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I74024fbb550f8c405f2850bd20b90599370b0bad
2021-03-11 00:58:01 +00:00
Abel Tesfaye
77540067da
Merge "Update autorotate search terms" into sc-dev am: bf182903ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13818585
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I73be6864df6c43bccf9f61872a47e9bc38ffc602
2021-03-11 00:27:09 +00:00
Andras Kloczl
e0f8214e80
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:15:46 +00:00
Andras Kloczl
798bdd90b0
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:15:27 +00:00
Andras Kloczl
e36357b20c
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:14:59 +00:00
Andras Kloczl
07e414017c
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:13:05 +00:00
Abel Tesfaye
bf182903ed
Merge "Update autorotate search terms" into sc-dev
2021-03-10 23:25:37 +00:00
Treehugger Robot
e9dff191b0
Merge "Update src/com/android/settings/inputmethod/OWNERS"
2021-03-10 23:05:57 +00:00
Yi Jiang
01f1c660a0
Fixes UI style issues in Screen Timeout setting
...
1. Remove help url and search icon.
2. Uses BannerMessage for permission missing notification.
Test: manual
Bug: 182297705
Change-Id: Id4dc998d7276f4c4f7593b1b0312d92097ec83cf
2021-03-10 12:58:46 -08:00
Ahaan Ugale
1e45409e76
Merge "AF: Unit tests for PasswordsPreferenceController." into sc-dev am: e9355553ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13797113
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41121bfe174a5e644ba5a70c0be32fa034c07ff6
2021-03-10 20:16:23 +00:00
Ahaan Ugale
e9355553ee
Merge "AF: Unit tests for PasswordsPreferenceController." into sc-dev
2021-03-10 20:08:08 +00:00
Yohei Yukawa
5878a77218
Update src/com/android/settings/inputmethod/OWNERS
...
Let's update this legacy OWNERS file based on the current reality.
Hopefully this would make it easier for contributers to find available
owner reviewers.
Fix: 182385491
Test: n/a
Change-Id: If47b5c0b83d561dceacc58c8fbd3643524432d62
2021-03-10 10:37:51 -08:00
Mill Chen
0023100e7f
Declare activities for factory reset pages
...
When trying to trigger factory reset from Settings app, it's unexpected
that Settings will get a fatal ActivityNotFoundException, causing
Settings crash. The factory reset pages have changed their launching
way from by SubSettingsLauncher to by startActivity directly. These
activities haven't been declared in AndroidManifest.xml, which caused
this issue.
Fixes: 182144129
Test: rebuild and manual
1) Flash the device with aosp build
2) Navigate to Reset options (Settings -> System -> Reset options)
3) Observe and check if Settings gets crashed
Change-Id: Ia99f269e237d7c84153d4b903cbca14c33835dc1
2021-03-11 01:39:03 +08:00
TreeHugger Robot
32572a2f87
Merge "Prevent a larger title from displaying incompletely" into sc-dev am: 8c6564b67e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815932
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1319c41ed6572319a91fec78cdf3d4d199513da5
2021-03-10 16:00:52 +00:00
Yanting Yang
7c0a4c3920
Merge "Update metrics category for new app page" into sc-dev am: 16b6910b7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13806594
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4ec50247dee5d27ae0e9e2a19dcab480dc2bf715
2021-03-10 15:58:36 +00:00
TreeHugger Robot
cf6f531b75
Merge "[Provider Model] Add Wi-Fi toggle slice" into sc-dev am: 38e19abdf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805366
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie1f083a1c9c7094477ff76501213e1db982d4016
2021-03-10 15:45:14 +00:00