Commit Graph

89170 Commits

Author SHA1 Message Date
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
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
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
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
SongFerng Wang
01c0d19d8b Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2 am: 190e926aab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430

Change-Id: I7cf641cdcfe5c660121e656c5e2abb4869c3c8e8
2021-10-18 08:42:27 +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
Zoey Chen
eb19d4ba59 [Foldable] Show full screen "Install Certificates" for large screen devices
Uses Intent.FLAG_ACTIVITY_NEW_TASK to start the Activity

Test: manual
Bug: 197701944
Change-Id: I6d52bae5ceb399c0869ef0c76d89f16867a83065
2021-10-18 07:21:06 +00:00
Joshua Mccloskey
cadd832d42 Merge "Tap fp find sensor animation goes to next page." into sc-v2-dev am: 3efe6e59f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047402

Change-Id: Ic5127cedcc35fa8b51ea0df9088d1eba132b52ed
2021-10-15 21:14:27 +00:00
Joshua Mccloskey
3efe6e59f7 Merge "Tap fp find sensor animation goes to next page." into sc-v2-dev 2021-10-15 20:54:46 +00:00
TreeHugger Robot
095dcbc16b Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev am: c5cc2f81fe am: bb0c2c4fc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048447

Change-Id: I7e8d1c6fa1ecc6d90a573a7f053a60f09367679c
2021-10-15 20:33:28 +00:00
TreeHugger Robot
ea805db192 Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev am: c5cc2f81fe am: 49bd615d6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048447

Change-Id: I1be4a0c1aaf8a0d30943b7669ae96e2b41363088
2021-10-15 20:32:46 +00:00
TreeHugger Robot
49bd615d6b Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev am: c5cc2f81fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048447

Change-Id: Ie08d46288074ae6df95535d203728a9b81c4c8c5
2021-10-15 20:21:03 +00:00
TreeHugger Robot
bb0c2c4fc7 Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev am: c5cc2f81fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048447

Change-Id: I8a9eabbbf330dbb2db33c4d0ce000403e55be99d
2021-10-15 20:21:02 +00:00
TreeHugger Robot
c5cc2f81fe Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev 2021-10-15 20:05:38 +00:00
Bill Yi
f97291946d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9 -s ours am: b4a75e746e -s ours am: 92da783302 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2a1769724940b17c3af326bbe872a3556ffa8f06
2021-10-15 14:56:57 +00:00
Bill Yi
1e3e2b34e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9 -s ours am: 2720310af9 -s ours am: 82f09c65fe -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie5f05e7fc97c233ddbbe9fe8d1f8abd7222d1646
2021-10-15 14:56:28 +00:00
Bill Yi
92da783302 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9 -s ours am: b4a75e746e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied408c68868a84c3f0fa4b600a336dd0c96a802d
2021-10-15 14:56:02 +00:00
TreeHugger Robot
6089f71fea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b39a31e8f8 -s ours am: ec17bd2bd6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia96a7f3b7d77ec95b40bf85f57a29cd4fe677391
2021-10-15 14:55:49 +00:00
Bill Yi
0868ca58ff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9 -s ours am: 2720310af9 -s ours am: 44c07ccd65 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6e1a407ee13a4bfc46e189c620a2ae9550d58cea
2021-10-15 14:45:02 +00:00
Bill Yi
82f09c65fe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9 -s ours am: 2720310af9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9dbdaa077bdea11b2ce6d116dadb7bc451f72fa1
2021-10-15 14:41:50 +00:00
Bill Yi
44c07ccd65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9 -s ours am: 2720310af9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icacdf9d66919270b9a3d0915c036260f1282182e
2021-10-15 14:41:41 +00:00
TreeHugger Robot
4e853fb5c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b39a31e8f8 -s ours am: 067c8a910a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie65357481cf00b855f2f35ab4207fc90e96c4d55
2021-10-15 14:41:25 +00:00
TreeHugger Robot
ec17bd2bd6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b39a31e8f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If79262008fa23e4760669f029956b8e1fc211ebd
2021-10-15 14:40:53 +00:00
TreeHugger Robot
067c8a910a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b39a31e8f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1de812e662889131ca37e8423741cf9caa7ad617
2021-10-15 14:40:51 +00:00
Bill Yi
2720310af9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id4c0601df966701353634da83252b6639b83c801
2021-10-15 14:40:48 +00:00
TreeHugger Robot
7ea2456bf0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 24cd72bf9c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6cff02b14c7f28f7caf75477093743808e7ec839
2021-10-15 14:40:24 +00:00
Bill Yi
b4a75e746e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I97c510fd3f22aa49b0f17150ef705cb469a0bd86
2021-10-15 14:39:56 +00:00
TreeHugger Robot
24cd72bf9c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-10-15 14:29:28 +00:00
TreeHugger Robot
b39a31e8f8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-15 14:28:06 +00:00
changbetty
bfd3020038 For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off
Bug: 202323013
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I4a26ec43bb7e1758b8170a7ff9fa7d5846cb4a35
2021-10-15 11:18:07 +00:00
Bill Yi
468ef0c35d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I62624bbe45d2ac7c2d653bba146804c3d72bc825
2021-10-15 04:50:51 +00:00
Bill Yi
8a603688a7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0dd09e87e7a2116b4ad5bbc03462b30e786cdd07
2021-10-15 04:46:50 +00:00
Bill Yi
0fd72130e9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ieb86bcc7d7e064bcb07a11534b76be5be8eb9cca
2021-10-15 04:43:13 +00:00
Stanley Wang
4bdda0110f Merge "Launch Google Play system update page with new task flag." into sc-v2-dev am: e517131123
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055434

Change-Id: If042c68a20edb19381932ea808a656fa62d020fa
2021-10-15 03:50:44 +00:00
Stanley Wang
b00b0616f3 Merge "Launch the following pages with new task flag." into sc-v2-dev am: edf9c35cf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055432

Change-Id: I1d01820889bf5f57451c23e53d4f163b4a22089d
2021-10-15 03:50:35 +00:00
Stanley Wang
e517131123 Merge "Launch Google Play system update page with new task flag." into sc-v2-dev 2021-10-15 03:34:34 +00:00
Stanley Wang
edf9c35cf1 Merge "Launch the following pages with new task flag." into sc-v2-dev 2021-10-15 03:34:06 +00:00
Stanley Wang
8d372abbdf Launch Google Play system update page with new task flag.
Based on the large screen design, this page should be launched as
a new task to fulfill the new UI design.

Fix: 197702320
Test: Manually test the UI
Change-Id: I4b44209f2facec42eb7dc2d46e9a1c1a9516fc39
2021-10-15 11:32:47 +08:00
Stanley Wang
c703ec392c Launch the following pages with new task flag.
Third-party
Google legal
System WebView

Based on the large screen design, those pages should be launched as
a new task to fulfill the new UI design.

Fix: 197701608
Fix: 197701739
Fix: 197702148
Test: Manually test the UI
Change-Id: Ia1d3a6f99a022f42dc0ee082ae3bf27f89db3cbc
2021-10-15 11:31:29 +08:00
Bonian Chen
11a40a0893 Merge "[Settings] Crash when resetting downloaded eSIM" into sc-qpr1-dev am: 74c4ca00e1 am: a37c73d819
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16039954

Change-Id: Iec1bd33b8bacd804fb7cdcdaff73599d4c6ca3d2
2021-10-15 02:09:22 +00:00
Bonian Chen
0925a120b3 Merge "[Settings] Crash when resetting downloaded eSIM" into sc-qpr1-dev am: 74c4ca00e1 am: 2a92ebefbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16039954

Change-Id: I06e99432bfb99f3fba3b9b676bd7e930be8e5458
2021-10-15 02:09:14 +00:00
Bonian Chen
a37c73d819 Merge "[Settings] Crash when resetting downloaded eSIM" into sc-qpr1-dev am: 74c4ca00e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16039954

Change-Id: I0c1be8f12ae5421980cb6e204c24b34b5b5ff191
2021-10-15 01:55:40 +00:00
Bonian Chen
2a92ebefbe Merge "[Settings] Crash when resetting downloaded eSIM" into sc-qpr1-dev am: 74c4ca00e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16039954

Change-Id: I56ec53c93e3a6941db8b2d57e57ad2c2e9e74276
2021-10-15 01:55:38 +00:00