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
András Klöczl
0e8881b6a0
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
am: 850263d0c6
am: 3bc6e61a44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I3a474956dd0591bc760ab9aba86fd7476f776eb8
2020-07-15 14:34:10 +00:00
András Klöczl
5f1984a185
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
am: 62f8eba220
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I5c3c52b369634f0fd531eabc23397033c1ec2919
2020-07-15 14:19:56 +00:00
András Klöczl
46922c26f6
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
am: 850263d0c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I20cc9c95340b76f81ab6c207ad0dcc2fcbf1d3eb
2020-07-15 14:19:44 +00:00
András Klöczl
3bc6e61a44
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
am: 850263d0c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: Ibc484a119111a84ac0fc6d9ab2b0ab42062fe71d
2020-07-15 14:19:30 +00:00
András Klöczl
62f8eba220
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I74c9bb596375c68bf414f208d8ad4b6058cf4d37
2020-07-15 14:04:09 +00:00
András Klöczl
850263d0c6
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I149473b03717cdbb10aede744e00e34f813b44ac
2020-07-15 14:03:57 +00:00
András Klöczl
15d9351ba0
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev
2020-07-15 13:50:34 +00:00
Bonian Chen
a5f08854e3
[Settings] Inclusive language for Data Usage
...
Change wordings in data usage part into inclusive language.
Bug: 160707804
Test: make RunSettingsRoboTests
Change-Id: I713e52df8201413b884257a51bc1f71a0d43179d
2020-07-15 02:52:32 +00:00
TreeHugger Robot
0d34f6c80b
Merge "Import translations. DO NOT MERGE"
2020-07-14 17:08:29 +00:00
Bill Yi
cc67039237
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c
-s ours am: d3265e35db
-s ours am: 697f0fc11d
-s ours am: 151541c799
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Ie4f7cff75bf87654b3bdb323f0c9de15143f0f1c
2020-07-14 16:33:33 +00:00
Bill Yi
f7b0915e1b
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c
-s ours am: 35632cb1c2
-s ours am: 0e7fdac130
-s ours am: 7871d50a53
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: I75aebcd1025af49cfd36c7d86b209f3ad8e00b81
2020-07-14 16:33:27 +00:00
Bill Yi
16c7d140f8
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c
-s ours am: 35632cb1c2
-s ours am: f9cf7d32ec
-s ours am: cad5554144
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Ide8c612ccfa5bc5677005563bd2221dd55b381af
2020-07-14 16:33:21 +00:00
Automerger Merge Worker
f782f2c357
Merge "[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9
-s ours am: 2580a067e1
-s ours" into rvc-qpr-dev-plus-aosp am: adb5b7c931
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: I6dc136cce85c1115b2003566984f4274023d3ab2
2020-07-14 16:33:16 +00:00
Bill Yi
9d194989c3
[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9
-s ours am: 182290e9b8
-s ours am: 78f997a771
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: Ie094c69976f3c5d0cf7d8da8850830558ea247ae
2020-07-14 16:33:02 +00:00
Bill Yi
151541c799
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c
-s ours am: d3265e35db
-s ours am: 697f0fc11d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Iaedccbda4b1463dcf0a59747eb806e6b2b78f261
2020-07-14 16:19:34 +00:00
Bill Yi
7871d50a53
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c
-s ours am: 35632cb1c2
-s ours am: 0e7fdac130
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: I3b00968bc0b9079dbd022cc18bd877f6d7646cb8
2020-07-14 16:19:27 +00:00
Bill Yi
697f0fc11d
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c
-s ours am: d3265e35db
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Ib535f86258804daf779ed6267509978332564780
2020-07-14 16:19:23 +00:00
Bill Yi
cad5554144
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c
-s ours am: 35632cb1c2
-s ours am: f9cf7d32ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Ic0caea5e5332f9bb11208e4eee81d367037dcb79
2020-07-14 16:19:13 +00:00
Automerger Merge Worker
adb5b7c931
Merge "[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9
-s ours am: 2580a067e1
-s ours" into rvc-qpr-dev-plus-aosp
2020-07-14 16:19:10 +00:00
Bill Yi
9808f1f5f7
[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9
-s ours am: 2580a067e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: I9138a2e6f5de4811b14fcfe4f94ae7c65423d68b
2020-07-14 16:19:05 +00:00
Bill Yi
78f997a771
[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9
-s ours am: 182290e9b8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: Iee9dd527d25ce6f7e7887ffdae99dd2cd568c6bb
2020-07-14 16:19:01 +00:00
Bill Yi
f9cf7d32ec
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c
-s ours am: 35632cb1c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: I2e7ca6f0d84fd0f4606f76f2aace8e7968710c0b
2020-07-14 16:05:13 +00:00
Bill Yi
2580a067e1
[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: Ic80d575d02bc7a2886b527c3fa4fa8886b68c21f
2020-07-14 16:05:07 +00:00