Commit Graph

40072 Commits

Author SHA1 Message Date
Julia Reynolds
0bbff606f2 Merge "Remove unused code" 2021-10-21 14:44:15 +00:00
Tsung-Mao Fang
fce8565e5e Update logic to check two pane resolution
Prior to this cl, we checked the app bounds for deciding
app in two pane or not. However, this might be broken in some certain
sceanrios.
Currently, api will check the entire task bounds.
If the width of task bounds is larger than two pane criteria,
then we treat it as in two pane mode.

Test: Highlighted behavior works correct.
Fix: 203763572
Change-Id: Ib14851b1e3e097328874c7956bb653f50820f877
2021-10-21 21:34:17 +08: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
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
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
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
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
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
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
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
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
Chloris Kuo
c8d09d6844 Merge "Rename Ranking.visuallyInterruptive to isTextChanged" 2021-10-18 23:29:01 +00:00
Chloris Kuo
d67e970290 Rename Ranking.visuallyInterruptive to isTextChanged
Bug: 201087764
Test: manually tested on device
Change-Id: I28b416a4ab9cc74f985c7c7c5c72ca6f7e1b6065
2021-10-18 20:13:00 +00:00
Chloris Kuo
66c41511cd Rename Ranking.visuallyInterruptive to isTextChanged
Bug: 201087764
Test: manually tested on device
Change-Id: I28b416a4ab9cc74f985c7c7c5c72ca6f7e1b6065
2021-10-18 12:40:01 -07:00
TreeHugger Robot
2933fa1efe Merge "Clear up unused code" 2021-10-18 18:13:07 +00:00
TreeHugger Robot
40f8910e8f Merge "Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition"" into sc-v2-dev am: 57919fbcfb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16063843

Change-Id: Ia964565d7a79b311b34e7be235ebb7c38b92793c
2021-10-18 15:25:25 +00:00
Zoey Chen
ddb6e6cc1c Merge "[Foldable] Show full screen "Install Certificates" for large screen devices" into sc-v2-dev am: 8227dc748a am: 95bd82bed8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16065967

Change-Id: I42aa849462d28c27c1f6ca26ca75c71f3ec6ab40
2021-10-18 15:18:41 +00:00
TreeHugger Robot
57919fbcfb Merge "Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition"" into sc-v2-dev 2021-10-18 15:08:46 +00:00
Zoey Chen
95bd82bed8 Merge "[Foldable] Show full screen "Install Certificates" for large screen devices" into sc-v2-dev am: 8227dc748a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16065967

Change-Id: I79d2483edcd841b936295b13bd6420087d86b61d
2021-10-18 15:04:04 +00:00
Yuri Lin
8cab46f57a Merge "Merge messages & conversations settings for DND priority senders." 2021-10-18 15:03:27 +00:00
Zoey Chen
8227dc748a Merge "[Foldable] Show full screen "Install Certificates" for large screen devices" into sc-v2-dev 2021-10-18 14:50:20 +00:00
Tsung-Mao Fang
78267b2f2f Catch a resource not found exception
Test: not see a crash
Bug: 198296421
Change-Id: I469a726a32d7bb2f6f81fc0dae27d5b1d1ac0933
2021-10-18 22:47:42 +08:00
Arc Wang
65730aafa6 Merge "[Large Screen] Fix deep link 2 tasks bug" into sc-v2-dev am: e8c0373f0e am: f1bb824808
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16075727

Change-Id: I8ed033492bc9c757f97e73fa316f9ae0f8111739
2021-10-18 12:40:37 +00:00
Arc Wang
f1bb824808 Merge "[Large Screen] Fix deep link 2 tasks bug" into sc-v2-dev am: e8c0373f0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16075727

Change-Id: I901411d5789d134b2c050256dac3f06e1f0a6974
2021-10-18 12:30:47 +00:00
Arc Wang
e8c0373f0e Merge "[Large Screen] Fix deep link 2 tasks bug" into sc-v2-dev 2021-10-18 12:18:07 +00:00
Arc Wang
19052cb45e [Large Screen] Fix deep link 2 tasks bug
When launching a Settings deep link, it will close
Activity of the deep link and start both
DeepLinkHomepageActivity & the deep link.

Since 1st launched deep link page is finished,
should also remove its task.

Bug: 203385355
Test: manual
      1. Create a Settings shortcut on launcher.
      2. Click the shortcut.
      3. Move Activity of the shortcut to background.
Change-Id: I04b3243bf51f3940167e4dca6f5a32d9e3cf2841
2021-10-18 17:50:38 +08:00
Wesley.CW Wang
d11dec2f82 Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition"
- Reverts commit e7cca4cd81
 - Add try-catch to handle unexpected operate

Reason for revert: Previous fix will cause a side effect which makes app stuck at Optimize mode after switching state from Unrestricted to Optimize, add a try catch to handle previous issue first

BYPASS_INCLUSIVE_LANGUAGE_REASON=legacy naming, not edit by this code change

Bug: 199892006
Test: make SettingsRoboTests
Change-Id: I3b1850ab66bbf4cd605f14152a244a8ed7edd578
Merged-In: I3b1850ab66bbf4cd605f14152a244a8ed7edd578
2021-10-18 09:03:06 +00:00
Wesley.CW Wang
2146a873c2 Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition"
- Reverts commit e7cca4cd81
 - Add try-catch to handle unexpected operate

Reason for revert: Previous fix will cause a side effect which makes app stuck at Optimize mode after switching state from Unrestricted to Optimize, add a try catch to handle previous issue first

BYPASS_INCLUSIVE_LANGUAGE_REASON=legacy naming, not edit by this code change

Bug: 199892006
Test: make SettingsRoboTests
Change-Id: I3b1850ab66bbf4cd605f14152a244a8ed7edd578
2021-10-18 09:02:11 +00:00
SongFerng Wang
fce5b4b405 Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2 am: 17fb53a1ad am: e590239085
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430

Change-Id: I34849b225700f7ccf74f16ac5f52cf4572ccc285
2021-10-18 08:54:13 +00:00
SongFerng Wang
e590239085 Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2 am: 17fb53a1ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430

Change-Id: Ib4049920f72b9534ca744e33b7553856184248b1
2021-10-18 08:41:54 +00:00
SongFerng Wang
17fb53a1ad Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430

Change-Id: Idc12ca6b932fc9143a4c83729af16b82fae1669e
2021-10-18 08:25:21 +00:00
SongFerng Wang
190e926aab Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430

Change-Id: I7179fea2bf2925e5950bfffbad8289302a5ca772
2021-10-18 08:25:19 +00:00
SongFerng Wang
11af4846b2 Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev 2021-10-18 08:13:49 +00:00