Commit Graph

97478 Commits

Author SHA1 Message Date
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
Betty Chang
bce2922780 Merge "Remove the Advanced item when Security type is open" into sc-v2-dev am: 54abe8fac8 am: 42fe8e4d59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091077

Change-Id: Ib847e9ae43683f2ca66617e203015c34afa0344f
2021-10-21 12:55:04 +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
Sergey Nikolaienkov
607409c49c Merge "Use new constructor for CDM's Associations" 2021-10-21 12:01:13 +00:00
Yanting Yang
4d30055853 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-v2-dev am: 06ebebdf0f am: 260365b00a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16081488

Change-Id: Id0e945a93fb4dde5b713c90bd89015d571189c2b
2021-10-21 11:13:03 +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
YUKAI HUNG
265d683dc1 Merge "Update app usage page power summary" into sc-v2-dev am: 8e97bdd76c am: 054f3b5199
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091765

Change-Id: Ic7bf43d79304b740b5b6cf2a148b317860ea4869
2021-10-21 11:08:48 +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
55387e1a48 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5 2p: d8be8ad5f2
Blank merge reason: parent was merged -s ours

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099516

Change-Id: I50564b2434b40a1b96e52dc77d89aea49bc69653
2021-10-21 08:12:49 +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
d8be8ad5f2 [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: I990be2a057aedc3a465a6547af9b782d51096eda
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
Bill Yi
47c3f79249 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4ed723b68cf979f2d12cb6833bfd24eac15e8eca
2021-10-21 08:08:40 +00:00
Bill Yi
667fece2ac [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 691a937581
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099507

Change-Id: I06df1727df3cfccd257ad2e7bff3e63141d213c6
2021-10-21 07:58:13 +00:00
Bill Yi
691a937581 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3dd32e24bc59c003587d57c0b26107bd93777e90
2021-10-21 07:58:04 +00:00
Sergey Nikolaienkov
52ab4af51f Use new constructor for CDM's Associations
Bug: 197933995
Test: make SettingsRoboTests
Change-Id: I6097053a9a58128366f5d12b918d3e0721d752f2
2021-10-21 07:53:41 +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
Julia Reynolds
ac8911fda8 Remove unused code
Test: make
Bug: 194833441
Change-Id: I99a91281fd8f8a347f80ebfa881eafb960d7f144
2021-10-20 13:20:33 -04:00
changbetty
aab7b55926 Add location check for Wifi Scanning notify message
Bug: 203471614
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I0fccd1a8dfd8e6ca499a6f87a59772f70961bc1d
2021-10-20 15:14:08 +00:00
Jason Hsu
f876306c36 Merge "Fix software shortcut in dialog did not update when content change." into sc-v2-dev am: 56e82fe112 am: 33914ed556
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16005288

Change-Id: I061d40c46ff678d6199db650e212d32d23ce57db
2021-10-20 10:42:01 +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
847a3dbf6e Merge "Update UWB toggle display after lifecycle events." into sc-qpr1-dev am: faf452bf94 am: 16893da2e4 am: 42e593f9db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047401

Change-Id: Id237f8c04cced329a39deb4cc1709f7ebf25ddc9
2021-10-20 05:22:18 +00:00
TreeHugger Robot
5c93284201 Merge "Update UWB toggle display after lifecycle events." into sc-qpr1-dev am: faf452bf94 am: b097e09dd7 am: cc6de81b52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047401

Change-Id: I7b10e68e133c04feff0fc1729cccc921ddfc1b50
2021-10-20 05:22:09 +00: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
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
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
faf452bf94 Merge "Update UWB toggle display after lifecycle events." into sc-qpr1-dev 2021-10-20 04:43:47 +00:00
TreeHugger Robot
2bd09f9343 Merge "Catch a resource not found exception" into sc-v2-dev am: 541f0e447f am: db744aaa66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16075735

Change-Id: I0a8ca619d677dc95e8614934dcd9830d21c93ccf
2021-10-19 08:00:51 +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
1d7aa729e5 Merge "Add missed "optional_uses_libs" to avoid testing failed" into sc-v2-dev am: 65022abe43 am: 212bd58428
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16075738

Change-Id: Ia933f8891a0cbe20d19fcf7f753a68bc2b9b5558
2021-10-19 06:55:49 +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
241f1a196d Merge "Improve scalability of Settings deep link API" into sc-v2-dev am: 499d8b26bd am: 4659f73cbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15981710

Change-Id: Ia13cb302ed356158acbba7db5205757bbcf89a03
2021-10-19 04:28:19 +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
Yanting Yang
d091ce4725 Merge "Rephrase dialog message of clear storage dialog for security concern" 2021-10-19 02:29:35 +00:00
Chloris Kuo
811615d359 Rename Ranking.visuallyInterruptive to isTextChanged am: d67e970290 am: 25d6a106c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16077136

Change-Id: If62d4fd4b59853f423f241d7e3a48ff369fae2df
2021-10-19 01:43:38 +00:00