Bill Yi
f553610bfd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52146b1b0a -s ours am: 23f6d03633 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099517
Change-Id: I704f81e1ba20df0ff29d25c827267cf0b8f507a6
2021-10-22 01:38:52 +00:00
Bill Yi
83edf2430a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 247075dcd5 -s ours am: 4bb4205b98 -s ours am: 4c9877242c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099516
Change-Id: I14462347292419f3ae5a1c1e07b2cd595750de47
2021-10-22 01:38:01 +00:00
TreeHugger Robot
5a277a138e
Merge changes from topic "presubmit-am-7ec75ddcc57e4269a8bd00190c66c479" into sc-qpr1-dev am: 3c824a23e6 am: 17d5b1fc06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099516
Change-Id: I3cc685f8b616e58df8abecc7ff5cad8a8f00c431
2021-10-22 01:37:55 +00:00
Bill Yi
7939993517
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5 am: bace1bf648 -s ours am: 1aa1369fd8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099516
Change-Id: I5bb931e43e2115ec047c72a3bbdf71ea1939fd96
2021-10-22 01:37:55 +00:00
Bill Yi
6d0d3e2d81
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52146b1b0a -s ours am: 9b4af9ca03 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099517
Change-Id: I337b89b36a85c2d55e90d4d712a32bedc1637c43
2021-10-22 01:37:44 +00:00
Bill Yi
4c9877242c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 247075dcd5 -s ours am: 4bb4205b98 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099516
Change-Id: I2677a4bb0fac39636b5a83879c43cb801566e1f1
2021-10-22 01:33:10 +00:00
TreeHugger Robot
17d5b1fc06
Merge changes from topic "presubmit-am-7ec75ddcc57e4269a8bd00190c66c479" into sc-qpr1-dev am: 3c824a23e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099516
Change-Id: Ie9e4192c1a90a4f721ff02331df5b54370a5d7b2
2021-10-22 01:21:57 +00:00
Bill Yi
1aa1369fd8
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5 am: bace1bf648 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099516
Change-Id: Id40fd4e26953fcf755ac5ea6cc4643720a199e58
2021-10-22 01:21:56 +00:00
Bill Yi
23f6d03633
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52146b1b0a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099517
Change-Id: I3d8afaa0ef3a980f99da6efa5735c5e85fd04346
2021-10-22 01:21:46 +00:00
Bill Yi
9b4af9ca03
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52146b1b0a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099517
Change-Id: I93be458d57eb11d851fcf6570e1dc12345ebc661
2021-10-22 01:21:39 +00:00
Bill Yi
4bb4205b98
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 247075dcd5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099516
Change-Id: Ic29a34b7823931a043d7b419a11dd69118e2f750
2021-10-22 01:17:57 +00:00
TreeHugger Robot
3c824a23e6
Merge changes from topic "presubmit-am-7ec75ddcc57e4269a8bd00190c66c479" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5
Import translations. DO NOT MERGE ANYWHERE
2021-10-22 01:04:30 +00:00
TreeHugger Robot
7288675fec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0c4b29958b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099518
Change-Id: I0a5a0b0f61da0053d5e2376d924228509848102d
2021-10-22 01:04:08 +00:00
TreeHugger Robot
0c4b29958b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-10-22 00:49:01 +00:00
TreeHugger Robot
c635251a94
Merge "RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth"" into sc-v2-dev am: c1770fe4cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048451
Change-Id: Ic24c74bff7c2c88d558620897500b4f560a81f7f
2021-10-21 15:18:18 +00:00
Chienyuan
f06def46f7
RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth" am: 1b9a21ffb5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048451
Change-Id: I7a693b6644e200a7aa66f09704e39c178aa2baa7
2021-10-21 15:18:13 +00:00
TreeHugger Robot
c1770fe4cf
Merge "RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth"" into sc-v2-dev
2021-10-21 15:04:46 +00:00
Weng Su
e155a7b61d
Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 am: 400e5b0fba am: 8cf3250517 am: 76e3973684
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101
Change-Id: Ic5115a90c11784019c2be7b1ef7c8a47de02e846
2021-10-21 13:37:59 +00:00
Weng Su
76e3973684
Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 am: 400e5b0fba am: 8cf3250517
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101
Change-Id: Ifc9692777cd4e99ee358a4599317b69a619745ac
2021-10-21 13:20:13 +00:00
Weng Su
8cf3250517
Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 am: 400e5b0fba
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101
Change-Id: Idb08b9650e7c5efce4ab40eb949ccab0e5949333
2021-10-21 13:10:56 +00:00
Weng Su
400e5b0fba
Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101
Change-Id: I44f373cab6a829af3e08ab95d62d53a42516d41a
2021-10-21 12:56:02 +00:00
Weng Su
ab7640dcd9
Merge "Keep compatibility for old WiFi shortcut"
2021-10-21 12:38:12 +00:00
Betty Chang
42fe8e4d59
Merge "Remove the Advanced item when Security type is open" into sc-v2-dev am: 54abe8fac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091077
Change-Id: I738cf43b802c21afc59d3ca277b8b690ab8e0877
2021-10-21 12:38:10 +00:00
Betty Chang
54abe8fac8
Merge "Remove the Advanced item when Security type is open" into sc-v2-dev
2021-10-21 12:23:59 +00:00
Yanting Yang
260365b00a
Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-v2-dev am: 06ebebdf0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16081488
Change-Id: If2595b9b8fafcb138e692a2cc35cd378f5524f2b
2021-10-21 11:09:06 +00:00
Yanting Yang
06ebebdf0f
Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-v2-dev
2021-10-21 10:52:25 +00:00
YUKAI HUNG
054f3b5199
Merge "Update app usage page power summary" into sc-v2-dev am: 8e97bdd76c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091765
Change-Id: Ifbe0fee50f01f00784bd65aa6124081b41b1f3c7
2021-10-21 10:48:11 +00:00
YUKAI HUNG
8e97bdd76c
Merge "Update app usage page power summary" into sc-v2-dev
2021-10-21 10:31:31 +00:00
Wesley.CW Wang
23a5fb5e74
Update app usage page power summary
...
- Present empty string when this app consumed power but no usage time,
usually they are some system components
Bug: 197749108
Test: make -j64 RunSettingsRoboTest
Change-Id: I1e88babb30c871748fa1f5fc23c7b4d834e384fd
2021-10-21 17:29:36 +08:00
Bill Yi
34f9c66cf0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8d64b289a352c07336d55b2d561a5855934c5d8b
2021-10-21 08:20:09 +00:00
Bill Yi
52146b1b0a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idf72f0b25491f38f592613b85cd7e20c5935681a
2021-10-21 08:16:13 +00:00
Bill Yi
bace1bf648
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099516
Change-Id: Ic81a43d273bbb6f70c73eab5b8c2ea43a3684bf8
2021-10-21 08:12:44 +00:00
Bill Yi
247075dcd5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia2cd9e21b6ad60ef3f4ebabdc7fbe77c752c34f0
2021-10-21 08:12:37 +00:00
changbetty
6ceab7b916
Remove the Advanced item when Security type is open
...
Bug: 202674761
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest
Change-Id: Iaac76a5a1370d5f9fcea2e1aaa0f02310ed4a5a3
2021-10-21 05:51:20 +00:00
Jason Hsu
33914ed556
Merge "Fix software shortcut in dialog did not update when content change." into sc-v2-dev am: 56e82fe112
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16005288
Change-Id: I9a37e193ad72c639a10ebe10cb0868215b1823c7
2021-10-20 10:21:32 +00:00
Jason Hsu
56e82fe112
Merge "Fix software shortcut in dialog did not update when content change." into sc-v2-dev
2021-10-20 10:06:56 +00:00
jasonwshsu
eba8e8da19
Fix software shortcut in dialog did not update when content change.
...
Root Cause: Dialog only get updated when clicked the trigger button to show dialog.
Solution: Update the software shortcut content in dialog if needed in onResume() stage.
Bug: 183342594
Test: atest AccessibilityDialogUtilsTest
Change-Id: Ibcd66d6c57f1790f96f234e49f456cbc2c990f64
2021-10-20 16:25:26 +08:00
TreeHugger Robot
42e593f9db
Merge "Update UWB toggle display after lifecycle events." into sc-qpr1-dev am: faf452bf94 am: 16893da2e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047401
Change-Id: I4ae57c120d4a384c7dc99d0e2d7ea95972d11d85
2021-10-20 05:06:40 +00:00
TreeHugger Robot
cc6de81b52
Merge "Update UWB toggle display after lifecycle events." into sc-qpr1-dev am: faf452bf94 am: b097e09dd7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047401
Change-Id: I8c8642f92a32eed925f72cabb6c9802159e6a8dc
2021-10-20 05:06:04 +00:00
TreeHugger Robot
b097e09dd7
Merge "Update UWB toggle display after lifecycle events." into sc-qpr1-dev am: faf452bf94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047401
Change-Id: I34e321f6a32401f5b0adcaacf90a63d32e7bccef
2021-10-20 04:53:31 +00:00
TreeHugger Robot
16893da2e4
Merge "Update UWB toggle display after lifecycle events." into sc-qpr1-dev am: faf452bf94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047401
Change-Id: Ie12d95410e74e8091c27c42c6e3da86ddb086bf6
2021-10-20 04:53:31 +00:00
TreeHugger Robot
faf452bf94
Merge "Update UWB toggle display after lifecycle events." into sc-qpr1-dev
2021-10-20 04:43:47 +00:00
TreeHugger Robot
db744aaa66
Merge "Catch a resource not found exception" into sc-v2-dev am: 541f0e447f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16075735
Change-Id: I1cf48bea5d20a323a2d7c50a63bb122bdc04ac8d
2021-10-19 07:43:43 +00:00
TreeHugger Robot
541f0e447f
Merge "Catch a resource not found exception" into sc-v2-dev
2021-10-19 07:26:40 +00:00
YUKAI HUNG
212bd58428
Merge "Add missed "optional_uses_libs" to avoid testing failed" into sc-v2-dev am: 65022abe43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16075738
Change-Id: I699fb1902bc400b3008ba3b21357a46b98a80b39
2021-10-19 06:43:41 +00:00
YUKAI HUNG
65022abe43
Merge "Add missed "optional_uses_libs" to avoid testing failed" into sc-v2-dev
2021-10-19 06:28:30 +00:00
Arc Wang
4659f73cbe
Merge "Improve scalability of Settings deep link API" into sc-v2-dev am: 499d8b26bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15981710
Change-Id: I86fe5ccbfd87a8758fb6b00ee76061e61943c512
2021-10-19 04:12:00 +00:00
Arc Wang
499d8b26bd
Merge "Improve scalability of Settings deep link API" into sc-v2-dev
2021-10-19 03:56:28 +00:00
Yanting Yang
2c7eb91a96
Rephrase dialog message of clear storage dialog for security concern
...
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620 )
2021-10-19 02:31:14 +00:00
Chloris Kuo
25d6a106c8
Rename Ranking.visuallyInterruptive to isTextChanged am: d67e970290
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16077136
Change-Id: Ib09cb44ad4d5508025a4c655691a3d5faef7180f
2021-10-19 01:30:09 +00:00