Arc Wang
2d20ab7ea7
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
am: e1660daab4
am: 83d11bebe2
am: eeb0bcc1b7
am: ab59455727
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: I3c9fb98bb5e280597d912e58a03df2337794af82
2021-04-06 14:02:53 +00:00
Arc Wang
647188cb90
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
am: e1660daab4
am: 83d11bebe2
am: 4c1e380701
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: I64c6f52ba14d787410088ab069184eec6686363d
2021-04-06 13:42:21 +00:00
Kholoud Mohamed
0a848989f2
Merge "Ignore failing test" into sc-dev
2021-04-06 13:37:12 +00:00
kholoud mohamed
f89306dace
Ignore failing test
...
Temporarily ignore the following failing presubmit test until the culprit
change is found
InteractAcrossProfilesDetailsTest#getPreferenceSummary_appOpNotAllowed_returnsNotAllowed
Test: atest InteractAcrossProfilesDetailsTest
Bug: 184238335
Change-Id: Ia6aa957bc0928e3a82465f35eda99938d34f19c4
2021-04-06 14:36:05 +01:00
Arc Wang
ab59455727
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
am: e1660daab4
am: 83d11bebe2
am: eeb0bcc1b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: Ic93423f744160ff8866e47e63d4ff730e13c137e
2021-04-06 13:17:57 +00:00
Arc Wang
4c1e380701
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
am: e1660daab4
am: 83d11bebe2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: I21ed6d8435f63c4184f606bdffbd9e7739a04445
2021-04-06 13:01:25 +00:00
Arc Wang
eeb0bcc1b7
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
am: e1660daab4
am: 83d11bebe2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: Ie359d84b40c5b7a706f40c8a1c905c8d9c02afab
2021-04-06 12:56:35 +00:00
Arc Wang
83d11bebe2
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
am: e1660daab4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: Ic9a7c0fb856096e02a20f40fa723a00b62d92819
2021-04-06 12:35:26 +00:00
TreeHugger Robot
3851053118
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
am: d0957376c0
am: e4749c3458
am: 1dcc4ee8a1
am: a2a7d18353
am: 848483a8e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: Ib48ddd3728e537ccc56e1821dc0e576756cc7913
2021-04-06 11:48:45 +00:00
Arc Wang
e1660daab4
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: I19629b5e098a176da1fe21e020deb8a78c6069ad
2021-04-06 11:43:37 +00:00
TreeHugger Robot
f3a5712fc2
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
am: d0957376c0
am: e4749c3458
am: 1dcc4ee8a1
am: e5fe80f5a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: Iae78e75b0ae20c47fa4e21814096ff3fee7f7dda
2021-04-06 11:05:48 +00:00
Arc Wang
9513326e44
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev
2021-04-06 11:03:29 +00:00
TreeHugger Robot
848483a8e8
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
am: d0957376c0
am: e4749c3458
am: 1dcc4ee8a1
am: a2a7d18353
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: I10f838480c81364933cc02d3c09f17f46d7f2964
2021-04-06 11:01:45 +00:00
TreeHugger Robot
e5fe80f5a8
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
am: d0957376c0
am: e4749c3458
am: 1dcc4ee8a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: I347494e3adb066c885d130b72f398d62c68e2ed6
2021-04-06 10:24:10 +00:00
TreeHugger Robot
a2a7d18353
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
am: d0957376c0
am: e4749c3458
am: 1dcc4ee8a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: I5038e3f5ed5963b4bfebd3aa643ce9de4296aed9
2021-04-06 10:19:22 +00:00
TreeHugger Robot
e36bc2779d
Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 759dc67158
am: bcfa963d8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835816
Change-Id: I79b86db04ca02e505b5cdc04198143631a8bb8b3
2021-04-06 10:03:29 +00:00
TreeHugger Robot
1dcc4ee8a1
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
am: d0957376c0
am: e4749c3458
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: Id2b2b68996481b1a177a284ef99dbd44bff0946b
2021-04-06 09:59:08 +00:00
TreeHugger Robot
e4749c3458
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
am: d0957376c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: I3a5f7ae870c60965676dc776120dc220c336b471
2021-04-06 09:37:39 +00:00
TreeHugger Robot
b38da9b295
Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 759dc67158
am: a577227b97
am: 7868a16f9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835816
Change-Id: Ib6a4049ee2ae5de1db138d05e01a0f94f7fa2add
2021-04-06 09:22:47 +00:00
TreeHugger Robot
81827f1d4b
Merge "Hide non-system overlay window on ActivityPicker" into rvc-qpr-dev am: 7e3e9ed32a
am: 6f11ad8534
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835817
Change-Id: Idf436dcd110700e0d59cfdec2d85d683707e6a07
2021-04-06 09:22:40 +00:00
TreeHugger Robot
0d8b0ebd0d
Merge "Attempt to fix IllegalArgumentException from RecyclerView" into sc-dev
2021-04-06 09:04:33 +00:00
TreeHugger Robot
d0957376c0
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: If51aba7cfb3495b42335d90a1600734da17d4d42
2021-04-06 09:00:52 +00:00
TreeHugger Robot
bcfa963d8c
Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 759dc67158
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835816
Change-Id: I216ace1db29e22ea1697ad026b5c2203dc3bcfa0
2021-04-06 09:00:37 +00:00
TreeHugger Robot
7868a16f9b
Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 759dc67158
am: a577227b97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835816
Change-Id: I17f7826b66a4f328d157d119f8e586bd126ed3e1
2021-04-06 08:56:03 +00:00
TreeHugger Robot
6f11ad8534
Merge "Hide non-system overlay window on ActivityPicker" into rvc-qpr-dev am: 7e3e9ed32a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835817
Change-Id: I1fe5682763d592f4ba0b0468e829f1b8cbb42991
2021-04-06 08:55:57 +00:00
TreeHugger Robot
a577227b97
Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 759dc67158
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835816
Change-Id: Iaff23732bf96920b8c58e810d9a2a305ff3c274e
2021-04-06 08:55:53 +00:00
TreeHugger Robot
8bc9c9e6ef
Merge "Fix Settings crash" into sc-dev
2021-04-06 08:42:26 +00:00
TreeHugger Robot
7e3e9ed32a
Merge "Hide non-system overlay window on ActivityPicker" into rvc-qpr-dev
2021-04-06 08:24:45 +00:00
TreeHugger Robot
7a09c0613f
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev
2021-04-06 08:23:13 +00:00
TreeHugger Robot
759dc67158
Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev
2021-04-06 08:22:07 +00:00
Fan Zhang
22f8082c42
Merge "Minor UI tweak on Safety settings" into sc-dev
2021-04-06 07:07:55 +00:00
TreeHugger Robot
70a9eea314
Merge "Misc tweaks to Safety settings UI" into sc-dev
2021-04-06 06:03:54 +00:00
Mill Chen
05c2a2bf41
Fix Settings crash
...
When pressing back from fingerprint enrollment flow, Settings will get
crashed. That was caused by calling a destroied fragment manager to
create an error dialog.
Bug: 184234884
Test: manual test
1) Settings -> Security -> Fingerprint
2) Following the enrollment flow, then pressing back from either find
sensor or enrolling page
3) Observe and see if there's no crash
Change-Id: I2028df0c6a65e8e960a627161834660681b7b70a
2021-04-06 12:35:14 +08:00
TreeHugger Robot
20e610b6bd
Merge "Fix the talkback problem of the "Verified link info" icon" into sc-dev
2021-04-06 03:18:12 +00:00
Fan Zhang
32b6e7ad7a
Minor UI tweak on Safety settings
...
* Move "more settings" button to top
* Changed button shape to have a more rounded corner radius.
* https://screenshot.googleplex.com/HCrnFHKAGxYcHci.png
Bug: 184261824
Test: manual
Change-Id: I907869bd459ee18eb9ba06f89f220185fdc8c276
2021-04-05 23:43:35 +00:00
Sally Yuen
9aff855052
Merge "[Reduce Bright Colors] Use a switch preference" into sc-dev
2021-04-05 16:15:31 +00:00
sallyyuen
166c89890e
[Reduce Bright Colors] Use a switch preference
...
Test: atest ReduceBrightColorsPreferenceControllerTest, manual
Bug: 128465252
Change-Id: I824af24e545d38bad74613147328cf51108a9127
2021-04-05 16:14:59 +00:00
Julia Reynolds
6ca32df6b6
Merge "Only show enhanced options for migrated apps" into sc-dev
2021-04-05 13:30:57 +00:00
Sunny Shao
a6daad6ce6
Fix the talkback problem of the "Verified link info" icon
...
- Add the description to the contentDescription attribute.
Fixes: 183808786
Test: manual test
Change-Id: Icca45f2f7bf93c4a949095e810b97b6cff6b7558
2021-04-05 11:54:41 +08:00
TreeHugger Robot
c103d6a4f5
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-05 02:01:40 +00:00
Bill Yi
7874d8e62a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I389256341a0b1f398eb21c91e26a0884127b0de0
2021-04-04 11:57:04 +00:00
Bill Yi
61ed5ced16
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie15e5c6fface9f7f2685500a843a6146f4854ee8
2021-04-04 11:27:52 +00:00
TreeHugger Robot
9b66cefa48
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-03 04:17:31 +00:00
TreeHugger Robot
3d25650265
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-03 04:08:05 +00:00
Bill Yi
c181acd313
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I82383299dd970fba9caec3c6d6655bd94be8a7b7
2021-04-03 02:20:06 +00:00
Bill Yi
bf172a131f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I61889b4b2af1661d93590f98956fe0dfc391d194
2021-04-03 01:18:47 +00:00
Fan Zhang
1c16a3bb67
Misc tweaks to Safety settings UI
...
- Remove emergency info setting tile from Safety setting page. The
emergency info setting is now injected as emergency contact & medical
info settings.
- Add an icon to emergency gesture setting
- Add an icon place holder to WEA setting
Bug: 184261824
Test: manual
Change-Id: I8bb9abfac054b5745e978695043584ea1266d53e
2021-04-02 22:17:08 +00:00
Pavel Grafov
3574bfc1a6
[automerger skipped] Prevent disconnecting admin-configured VPN am: 735a216da3
am: 18c04f023a
-s ours am: 4350fa4c78
-s ours
...
am skip reason: skip tag Change-Id Id59d2ac2782e83601bc3093d3a092faea36ff5d9 with SHA-1 735a216da3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13931528
Change-Id: If9f0bf0e9639e636dd31bdd7352d0ac5b450063f
2021-04-02 20:09:30 +00:00
Pavel Grafov
2de4347bcc
[automerger skipped] Prevent disconnecting admin-configured VPN am: 735a216da3
am: 9ca72695fd
-s ours
...
am skip reason: skip tag Change-Id Id59d2ac2782e83601bc3093d3a092faea36ff5d9 with SHA-1 16d588c11a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13931528
Change-Id: I1c7aaf63fb33ca9cf44847891ad7868107cbf4ac
2021-04-02 19:50:14 +00:00
Pavel Grafov
4350fa4c78
[automerger skipped] Prevent disconnecting admin-configured VPN am: 735a216da3
am: 18c04f023a
-s ours
...
am skip reason: skip tag Change-Id Id59d2ac2782e83601bc3093d3a092faea36ff5d9 with SHA-1 16d588c11a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13931528
Change-Id: I8f040b6e43390b5efb674bfc464aa4a68527de01
2021-04-02 19:25:49 +00:00