TreeHugger Robot
86a89156bc
[automerger skipped] Merge "Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition"" into sc-v2-dev am: 57919fbcfb
am: 40f8910e8f
-s ours
...
am skip reason: Merged-In I3b1850ab66bbf4cd605f14152a244a8ed7edd578 with SHA-1 2146a873c2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16063843
Change-Id: I5b6a7e24b28f1e0335317c1d20041228841f6daa
2021-10-18 15:38:27 +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
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
ee4e89e54f
Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2
am: 190e926aab
am: 01c0d19d8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430
Change-Id: I04ff9cb037f72908c902acbca3f5882cedeeb64f
2021-10-18 08:54:27 +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
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
b7e97e4f58
Merge "Tap fp find sensor animation goes to next page." into sc-v2-dev am: 3efe6e59f7
am: cadd832d42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047402
Change-Id: I473d44013c0d82e3c3ede0728b526015b6177b48
2021-10-15 21:32:16 +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
438451f224
Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev am: c5cc2f81fe
am: bb0c2c4fc7
am: 095dcbc16b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048447
Change-Id: I965bc97a97747c1c469e21dda4591bf7a315a388
2021-10-15 20:47:36 +00:00
TreeHugger Robot
a59d04fc76
Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev am: c5cc2f81fe
am: 49bd615d6b
am: ea805db192
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048447
Change-Id: I344b090fe19a804c2212022038c7084dc5b8789d
2021-10-15 20:47:06 +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
0bf265a715
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9
-s ours am: b4a75e746e
-s ours am: 92da783302
-s ours am: f97291946d
-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: I6091bfebcb86ed0fe1e694a08b08c4bbf19edf95
2021-10-15 15:11:02 +00:00
Bill Yi
f33f9af07a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9
-s ours am: 2720310af9
-s ours am: 82f09c65fe
-s ours am: 1e3e2b34e2
-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: I79880fdf69992f84670eb6db146374d7b8db8b60
2021-10-15 15:02:11 +00:00
TreeHugger Robot
9c3c9ed4af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b39a31e8f8
-s ours am: ec17bd2bd6
-s ours am: 6089f71fea
-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: I927beba5338ad57e9341545575a2877a25ba8f9e
2021-10-15 15:00:19 +00:00
Bill Yi
7336bf0141
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9
-s ours am: 2720310af9
-s ours am: 44c07ccd65
-s ours am: 0868ca58ff
-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: If478b59dd7f021c752898bf3fa538a4e775e0503
2021-10-15 14:58:50 +00:00
TreeHugger Robot
0477670b13
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b39a31e8f8
-s ours am: 067c8a910a
-s ours am: 4e853fb5c8
-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: Iee5c302e2765391d819e105c03833d5d074772bc
2021-10-15 14:57:17 +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
08fce20c15
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 24cd72bf9c
-s ours am: 7ea2456bf0
-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: I6bbec0877066cc9bb9e895bcf2774d77ab254897
2021-10-15 14:55:50 +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
Bill Yi
ba484c71a3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9
-s ours am: 0b030c27b4
-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: Icc8d2b76d049b786607214c088c40ae1b9a664cb
2021-10-15 14:40:59 +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
Bill Yi
64d68c2192
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c7ff2072e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16061615
Change-Id: I327a4a09023a2f6a0b2d65975a2c57d24c5f3806
2021-10-15 14:40:38 +00:00