Treehugger Robot
09e49ae39a
[automerger skipped] Merge "Remove NR NSA from voice network type" am: 46a50b35be
am: df7e42a213
-s ours am: b66acd05db
-s ours am: a2bc9a8afe
-s ours am: e9a9fb9b87
-s ours
...
am skip reason: Change-Id I77d92fab0020da356ae43293016237be7494c1e2 with SHA-1 4b5e95daa1
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930
Change-Id: I157cb1e101bd46130b0d945f2bdf65992cb99898
2020-07-17 20:03:20 +00:00
Bill Yi
1265d57dd0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If7f2659aeac4f67ae3765489f704b7c0b943e3dd
2020-07-17 12:59:17 -07:00
Treehugger Robot
e9a9fb9b87
[automerger skipped] Merge "Remove NR NSA from voice network type" am: 46a50b35be
am: df7e42a213
-s ours am: b66acd05db
-s ours am: a2bc9a8afe
-s ours
...
am skip reason: Change-Id I77d92fab0020da356ae43293016237be7494c1e2 with SHA-1 4b5e95daa1
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930
Change-Id: I6566aee6b5487fa824c09872a8ca04bc9b1a05c9
2020-07-17 19:42:30 +00:00
Treehugger Robot
a2bc9a8afe
[automerger skipped] Merge "Remove NR NSA from voice network type" am: 46a50b35be
am: df7e42a213
-s ours am: b66acd05db
-s ours
...
am skip reason: Change-Id I77d92fab0020da356ae43293016237be7494c1e2 with SHA-1 4b5e95daa1
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930
Change-Id: I6192eb9b471ae807ad24f4ec99755a098090188d
2020-07-17 19:13:31 +00:00
Treehugger Robot
b66acd05db
[automerger skipped] Merge "Remove NR NSA from voice network type" am: 46a50b35be
am: df7e42a213
-s ours
...
am skip reason: Change-Id I77d92fab0020da356ae43293016237be7494c1e2 with SHA-1 4b5e95daa1
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930
Change-Id: I0b5fe9de55e71422abb8f82fb6ca85c5d627b123
2020-07-17 18:48:00 +00:00
Treehugger Robot
df7e42a213
Merge "Remove NR NSA from voice network type" am: 46a50b35be
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930
Change-Id: Ic9f0a1b78d4bd5321dbc8ab814246d62d419a563
2020-07-17 18:16:14 +00:00
Treehugger Robot
46a50b35be
Merge "Remove NR NSA from voice network type"
2020-07-17 17:57:43 +00:00
Bill Yi
c2c8b6b7a7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9d84173a559cb2a949aba1bc28ef7d98d3f32baf
2020-07-17 10:47:34 -07:00
Bonian Chen
95b129c87d
[Settings] subscription UI should be closed when SIM is removed
...
When SIM is removed, subscription UI should actively be closed (instead of
waiting for user to leave UI).
Bug: 160197149
Test: manual
Change-Id: I2854147c956faa633a9682eee0028db6cd2d3912
2020-07-17 17:38:19 +00:00
Bonian Chen
bdd5e86974
[Settings] Provide carrier name when manual network select
...
Manual network select need to have carrier name in order to
display to the user when failure.
Bug: 161425622
Test: manual
Change-Id: Ib77c14273bc9b9ea17c41cdd40f7bad0af4abc93
2020-07-18 01:25:01 +08:00
Bill Yi
706bd58d00
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic3517eef64e0f59a1f7f46d3138e3898a62eb7b9
2020-07-17 08:35:46 -07:00
Julia Reynolds
52cf852b63
UX updates for notif history
...
- no relative time
- fix background color in dark theme
- fix text alignment in RTL
Test: manual
Fixes: 160061165
Fixes: 160388261
Fixes: 156410384
Change-Id: I7d4c5a5f81ce5b5ce43fdaa3ee99184906753a76
(cherry picked from commit 3dd023f363
)
2020-07-17 13:25:05 +00:00
Treehugger Robot
c4785ed3f3
[automerger skipped] Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6
am: 73a28754f1
-s ours am: 3330abffe8
am: f85f6c82db
am: 5e2a845c6e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: If55e1cd44fd8d49b9e2c220248e4f434ee323c34
2020-07-17 09:52:55 +00:00
Eran Messeri
fda780ce99
[automerger skipped] [DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7
am: 091c73f768
-s ours am: f853d0fd25
am: 7e539d9aa0
am: c003e578c0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: I0fc7c6e64a5e79e7bbc1290bf3d6aba01d786b08
2020-07-17 09:52:53 +00:00
Treehugger Robot
5e2a845c6e
[automerger skipped] Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6
am: 73a28754f1
-s ours am: 3330abffe8
am: f85f6c82db
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: I116b7eab12ebd64d3bf9c5840faf875b996ed569
2020-07-17 09:35:23 +00:00
Eran Messeri
c003e578c0
[automerger skipped] [DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7
am: 091c73f768
-s ours am: f853d0fd25
am: 7e539d9aa0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: I0d3b00f2cebf8122279aca1281afaf48107edfa1
2020-07-17 09:35:20 +00:00
Treehugger Robot
f85f6c82db
[automerger skipped] Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6
am: 73a28754f1
-s ours am: 3330abffe8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: I145f9155dcffa50cf8decb7a73b81417385a1c01
2020-07-17 09:19:16 +00:00
Eran Messeri
7e539d9aa0
[automerger skipped] [DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7
am: 091c73f768
-s ours am: f853d0fd25
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: Ib08fb1393f61909b0bec7a72258e90f575e95164
2020-07-17 09:19:13 +00:00
Treehugger Robot
3330abffe8
[automerger skipped] Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6
am: 73a28754f1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: I1dd28625768cf364bbaee112a8b2ad4a767cb556
2020-07-17 09:01:21 +00:00
Eran Messeri
f853d0fd25
[automerger skipped] [DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7
am: 091c73f768
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: Ida2e692c72cd1c79d95ae6b0e99196d05fa843e0
2020-07-17 09:01:18 +00:00
Treehugger Robot
73a28754f1
Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: I5c4f7993abf41fbbefca12962061451345c2e62e
2020-07-17 08:43:40 +00:00
Eran Messeri
091c73f768
[DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: Ie170b54b9b15d3abff3ec883d943d597b3719a77
2020-07-17 08:43:38 +00:00
Treehugger Robot
01ec6774e6
Merge "[DO NOT MERGE] Rollup Cert-related changes from R"
2020-07-17 08:28:38 +00:00
Jason Chang
8ece863482
Merge "Fix the description under timeout isn't translated completely"
2020-07-17 06:18:12 +00:00
Jason Chang
9cfe959a23
Fix the description under timeout isn't translated completely
...
Reuse existing string instead of using new string for one-handed
timeout description.
Bug: 159298092
Test: manual
Change-Id: I903998dc58218f67d37fa449ef1a6a0615637bb5
2020-07-17 14:06:12 +08:00
Kevin Chyn
7595874e63
Merge "Add face enroll accessibility dialog" into rvc-qpr-dev am: 4b83725ee6
am: 61259e7436
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172087
Change-Id: I6080fadd54962885a13ad08027916d13e0eacfe0
2020-07-17 03:14:26 +00:00
Kevin Chyn
61259e7436
Merge "Add face enroll accessibility dialog" into rvc-qpr-dev am: 4b83725ee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172087
Change-Id: I2689d66199b0cc6b1deb6dcea8aa1249af793e5b
2020-07-17 02:57:57 +00:00
Kevin Chyn
4b83725ee6
Merge "Add face enroll accessibility dialog" into rvc-qpr-dev
2020-07-17 02:34:39 +00:00
Kevin Chyn
243aa8e2e0
Add face enroll accessibility dialog
...
When accessibility services such as talkback are enabled, and the
user tries to start the non-accessibility enrollment flow, present
a confirmation dialog.
Fixes: 152633740
Test: Enable talkback, start enrollment
1) Accessibility flow --> no dialog, as expected
2) Non-accessibility flow --> new dialog shown
Test: No talkback, start enrollment. No dialog shown in either case
Change-Id: I0cd07a9d0012f6c9bea36e74365a6707755d3ab7
2020-07-16 16:33:16 -07:00
TreeHugger Robot
4601907cf1
Merge "UX updates for notif history"
2020-07-16 22:05:07 +00:00
Julia Reynolds
3dd023f363
UX updates for notif history
...
- no relative time
- fix background color in dark theme
- fix text alignment in RTL
Test: manual
Bug: 160061165
Bug: 160388261
Bug: 154795795
Change-Id: I7d4c5a5f81ce5b5ce43fdaa3ee99184906753a76
2020-07-16 16:32:05 -04:00
Julia Reynolds
77768bdeab
Fix overlapping importance icons am: 2f8bc4954c
am: c27cd002c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12171961
Change-Id: I7f55c5958af0cd5864316c544ef16e245e428ed3
2020-07-16 18:20:44 +00:00
Julia Reynolds
c27cd002c6
Fix overlapping importance icons am: 2f8bc4954c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12171961
Change-Id: I94432f5eccbd7f9acdf6a187c4852594034431a3
2020-07-16 18:07:59 +00:00
Sean Stout
b1e6805323
Merge "Revert "Rename ACTION_VIEW_ADVANCED_POWER_USAGE_DETAIL""
2020-07-16 16:45:58 +00:00
TreeHugger Robot
a12c827b1d
Merge "Fix overlapping importance icons"
2020-07-16 15:32:53 +00:00
TreeHugger Robot
2432658d23
Merge "Revert "[Wi-Fi] Apply WifiTrackerLib objects in Wi-Fi Slice""
2020-07-16 15:31:50 +00:00
Greg Kaiser
9e9255fb2a
Revert "[Wi-Fi] Apply WifiTrackerLib objects in Wi-Fi Slice"
...
This reverts commit 7b1aded2a6
.
Reason for revert: Settings is crashing for WiFi selection in SetupWizard on wembley
Bug: 161434533
Change-Id: I1d90e9bae1b31862fba674db0d7497e43f987a7f
Test: Locally reverted, reflashed, and was able to select WiFi without Settings crashing.
Exempt-From-Owner-Approval: Revert to clear up P0 while all owners are outside of work hours
2020-07-16 14:47:31 +00:00
Julia Reynolds
2f8bc4954c
Fix overlapping importance icons
...
We can't re-use the same background because not
all of the buttons are the same size
Test: manual
Fixes: 161297551
Change-Id: I8583cb2fbbcb971ab5819eefd84dde3f7c3b4bdf
2020-07-16 14:31:19 +00:00
Julia Reynolds
f04c167475
Fix overlapping importance icons
...
We can't re-use the same background because not
all of the buttons are the same size
Test: manual
Bug: 161297551
Change-Id: I8583cb2fbbcb971ab5819eefd84dde3f7c3b4bdf
2020-07-16 10:19:27 -04:00
Arc Wang
02d279a453
Merge "[Wi-Fi] Apply WifiTrackerLib objects in Wi-Fi Slice"
2020-07-16 09:32:42 +00:00
Arc Wang
7b1aded2a6
[Wi-Fi] Apply WifiTrackerLib objects in Wi-Fi Slice
...
This change uses WifiTrackerLib's WifiPickerTracker & WifiEntry
to replace SettingLib's WifiTracker & AccessPoint.
This change includes
1. WifiScanWorker has the callbacks similar to a lifecycle component
but it's not a lifecycle component. Let WifiScanWorker implements
LifecycleOwner and provides #getLifecycle() for WifiPickerTracker.
2. Remove captive portal related code because WifiEntry#connect will
handle captive portal login if it's necessary.
3. Create WifiSliceItem to wrap WifiEntry because WifiEntry is an
abstract object and it does not provide copy constructor.
Without copy construcor, Wi-Fi Slice may show unexpected information
when a WifiEntry is updated.
4. Use WifiTrackerLib's NetworkDetailsTracker & WifiEntry in
WifiDialogActivity because it gets a WifiEntry key from Wi-Fi Slice.
NetworkDetailsTracker can get the WifiEntry of th key.
Bug: 155613549
Bug: 152571756
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.slice
make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I0718f4647cea007a9b701922f3121a388dd43918
2020-07-16 15:56:42 +08:00
TreeHugger Robot
0829cea2bb
Merge "Add padding so text doesn't go to edge"
2020-07-16 01:26:32 +00:00
Beverly
9aa0440bd9
Add padding so text doesn't go to edge
...
Test: manual
Fixes: 159638458
Change-Id: I7a90437c12bad57695d6a0d0d1d8bf514cf28c77
2020-07-15 15:54:26 -04:00
Sean Stout
75ea57a65e
Revert "Rename ACTION_VIEW_ADVANCED_POWER_USAGE_DETAIL"
...
This reverts commit 44eecb7375
.
Reason for revert: The name has been reverted back to ACTION_VIEW_ADVANCED_POWER_USAGE_DETAIL
Change-Id: Ic13f665061b9fc58afeca4a57809248cc1a00743
Bug: 161298021
2020-07-15 17:52:55 +00:00
Bonian Chen
01daee8c23
Merge "[Settings] Inclusive language for Data Usage"
2020-07-15 15:47:56 +00:00
András Klöczl
99fc1ed502
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
am: 850263d0c6
am: 46922c26f6
am: 219f3d83ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: If93292700a9ed6ea242284708d2f2e7f37be5fe2
2020-07-15 14:49:38 +00:00
András Klöczl
eb64868053
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
am: 62f8eba220
am: 5f1984a185
am: d037ba59a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I37d48fd3ed57acf05cd133df45ea6deb56ea9389
2020-07-15 14:49:29 +00:00
András Klöczl
a7a20d705d
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
am: 850263d0c6
am: 3bc6e61a44
am: 0e8881b6a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: Ie4d2588387f4f8cfb75c5303ddfc72e676e5bf0d
2020-07-15 14:49:14 +00:00
András Klöczl
219f3d83ee
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
am: 850263d0c6
am: 46922c26f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I3054c49cb04ace38b4072d3fc43cb3e635d02246
2020-07-15 14:42:31 +00:00
András Klöczl
d037ba59a7
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
am: 62f8eba220
am: 5f1984a185
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: Icb990b7b55ecf61eda908eab2467f2b080b3e228
2020-07-15 14:34:18 +00:00