Treehugger Robot
16503cf517
Merge "Settings: Fix exception in about phone during SIM swap"
2020-08-19 14:47:21 +00:00
Bill Yi
ce56500655
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1ad07265a1ca636a35b8ab530b1a59a6c71d2b76
2020-08-19 03:03:00 -07:00
Bill Yi
db1ae6ce87
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I20ba771cd7f5a0bfc3ca1b9542f83fc80cb31edb
2020-08-19 01:35:18 -07:00
Bill Yi
9d00912dc0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3362a8464a53c7b75b3e73989951668ddbcd18c1
2020-08-19 00:50:39 -07:00
Automerger Merge Worker
4996bc3703
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: 69605d12d0
-s ours am: 6d103087f5
-s ours" into rvc-qpr-dev-plus-aosp
2020-08-19 07:46:38 +00:00
Automerger Merge Worker
db52445503
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: dc84153e81
-s ours am: 378313593e
-s ours" into rvc-qpr-dev-plus-aosp
2020-08-19 07:46:36 +00:00
Bill Yi
432082489f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: 69605d12d0
-s ours am: 6d103087f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: I53321eb8e940a22b141e8cfb50d7a893ac34a69a
2020-08-19 07:46:35 +00:00
Bill Yi
39f19a3075
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: dc84153e81
-s ours am: 378313593e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: I6b9cf5f2a76337db868357a83941dc6ed21d8122
2020-08-19 07:46:32 +00:00
Bill Yi
f5d33b43f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: dc84153e81
-s ours am: 921836ad03
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: I87277b6d1daf03f3d6d75bcc741f6831a9e93fd3
2020-08-19 07:46:23 +00:00
Bill Yi
6d103087f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: 69605d12d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: I3e07df5a184a12aa61997fb9db07fa7f80b71f88
2020-08-19 07:35:33 +00:00
Bill Yi
378313593e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: dc84153e81
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: Ieacb714ceb7fe2a150963db31fb8bc818132a7ef
2020-08-19 07:35:33 +00:00
Bill Yi
921836ad03
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours am: dc84153e81
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: Iae39fc4a676ce4e8c4567dcc3649f8a167711078
2020-08-19 07:35:25 +00:00
Bill Yi
69605d12d0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: I87be371a25573e769edbb80ed0817e02efb69cd5
2020-08-19 07:19:41 +00:00
Bill Yi
dc84153e81
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164
Change-Id: I46ef5ca050eb20176ce6783f3d4479b98823067b
2020-08-19 07:19:33 +00:00
Bill Yi
7f9d903a21
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7e397185b6e1a9d39e8af8d83c9f0c766ff09349
2020-08-18 21:53:23 -07:00
Automerger Merge Worker
dba49a339c
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4
-s ours am: 5b84d06935
-s ours" into rvc-qpr-dev-plus-aosp
2020-08-19 00:06:46 +00:00
Bill Yi
ee0336cfdd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4
-s ours am: 5b84d06935
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756
Change-Id: Ic4f58799fb98474e3a821a2ad1738dc23a030d97
2020-08-19 00:06:42 +00:00
Bill Yi
9f83e2311d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4
-s ours am: 71f92d16f6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756
Change-Id: I4e0bb025276fb7c296befad128ec4b7855300892
2020-08-19 00:06:38 +00:00
Bill Yi
71f92d16f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756
Change-Id: I7a85b209939df65602839039ba06c04ca20f3071
2020-08-18 23:55:57 +00:00
Bill Yi
5b84d06935
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756
Change-Id: I0de30d4aafd65ab184661b0b58979cedc5367f4a
2020-08-18 23:55:49 +00:00
Bill Yi
dba8d2eeb4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iad6c46f99fb4b3c48b6580c03a6e482655714213
2020-08-18 15:50:45 -07:00
Beth Thibodeau
ee7da79fbf
Allow user to block individual apps from resuming. am: 48ce5892e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12392268
Change-Id: I131ff7c33871d858a63824fc17ba168ba590f6e2
2020-08-18 14:39:26 +00:00
hoffc
291fd9b816
Settings: Fix exception in about phone during SIM swap
...
In about phone SIM status dialog fragment does not correctly remove the subscription change listener and broadcast receiver during SIM swap, which results in IllegalStateException force close and memroy leak.
Make sure to remove sub change listener and un-register broadcast receiver in SIM swap case.
Bug: 159410236
Change-Id: I7867852c58b2b38e0afc73422b7d616aa305199c
2020-08-18 13:57:55 +08:00
TreeHugger Robot
ef7b3433a9
Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 60e33309b2
am: e87f0d9fa2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12374931
Change-Id: Ib289fc74a560a02b2d925c8b941c8cc7a04f5d7f
2020-08-17 20:38:28 +00:00
TreeHugger Robot
e87f0d9fa2
Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 60e33309b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12374931
Change-Id: I13794e6cf89c14ea1ebd5a2751e4590f4b7f4c01
2020-08-17 20:25:53 +00:00
TreeHugger Robot
60e33309b2
Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp
2020-08-17 20:11:11 +00:00
Beth Thibodeau
48ce5892e8
Allow user to block individual apps from resuming.
...
This adds a new section to the media controls settings screen with a
list of apps that could potentially be used for resumption. If an app is
toggled off it will be added to a list of apps which will not persist in
QS, even when resumption is on.
Also updated the strings on this setting page to match UX
recommendation, so the default toggle state is now on.
Bug: 161813143
Bug: 159852516
Test: manual
Test: atest SettingsProviderTests
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="ResumableMedia"
Change-Id: Id3de52419ffba233469396dd47439428201e5e00
Merged-In: Id3de52419ffba233469396dd47439428201e5e00
2020-08-17 15:47:04 +00:00
Jiashen Wang
e03d5ad5fb
Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63
am: 4d00b8b57a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093
Change-Id: Ia300e8e5e31b868cfaeee342524832b6ebddddc8
2020-08-15 13:03:45 +00:00
Jiashen Wang
8e939b0dfc
Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63
am: e50cda81df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093
Change-Id: I549082280f8b9a49f75333f9327b92ea679caa61
2020-08-15 13:03:32 +00:00
Jiashen Wang
4d00b8b57a
Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093
Change-Id: I987fd968ff755e88942bd69409b59996a08c972a
2020-08-15 12:53:07 +00:00
Jiashen Wang
e50cda81df
Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093
Change-Id: Id36dbea5606b1775c83b3d6a53880a5f60ab715b
2020-08-15 12:52:55 +00:00
Jiashen Wang
bbcd54dd63
Adding dialogs to warn users about the potential eSIM erase failure
...
eUICC card could potential in the card error state and all the eSIM
operations will fail which could be fixed by a reboot. Thus, we need to
pop up a dialog to inform users that their eSIM profiles cannot be
erased successfully.
Bug: 163078560
Test: Manually tested by mocking the eUICC card error state.
Mock: https://docs.google.com/presentation/d/1AVNXxPbieTX1KmoewG4mo3xWPnEZyba_h9rPcwHHcr8/edit#slide=id.p
Change-Id: I102fb2de889e08554f525f2cbe1528bb9a37afd7
2020-08-15 05:31:49 +00:00
Yi-Ling Chuang
ecf25c02f0
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
am: f046aa5beb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: Iff0e8b936c7268c8622e8a7079a27d8a0e5be4dd
2020-08-15 02:20:48 +00:00
Yi-Ling Chuang
f9b6dd0fe7
[DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
am: c248da2974
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I6988e9ab91ae2cf15e95702c438d4c0529317095
2020-08-15 02:20:46 +00:00
Automerger Merge Worker
fa9cc7830a
Merge changes from topic "am-e6033234b46e499e83aea82567136c31" into rvc-qpr-dev-plus-aosp
...
* changes:
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
am: 4d6f8bf34d
[DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
am: 631465df31
2020-08-15 02:20:40 +00:00
Yi-Ling Chuang
09b5db829e
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
am: 4d6f8bf34d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: Ie5cea9ddee70dfbe48de0ce995ee6f4a1bcf36bc
2020-08-15 02:20:35 +00:00
Yi-Ling Chuang
50349a9543
Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed
am: ec05383478
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: I45f3140b7b3beba80536ca9779c33479a29b6a7d
2020-08-15 02:20:34 +00:00
Yi-Ling Chuang
e50265cb43
[DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
am: 631465df31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I72029cb7956edadd3faef36de6b0e81176575985
2020-08-15 02:20:32 +00:00
Jason Chiu
1dfb8c8644
[DO NOT MERGE] Update contextual cards display mechanism am: b824187524
am: 4113bf12d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: I206e049ba2e6e3652b6a316d269d6cf37af4c0b3
2020-08-15 02:20:30 +00:00
Yi-Ling Chuang
68e80545b0
Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed
am: f07366ff12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Id6b9042fe823441588be96689692fe47fbbde049
2020-08-15 02:20:15 +00:00
Jason Chiu
0f87cd00a1
[DO NOT MERGE] Update contextual cards display mechanism am: b824187524
am: 68173c1343
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Ib6bcff33b0dc7af2935e937f600cb6832f48febf
2020-08-15 02:20:13 +00:00
Yi-Ling Chuang
f046aa5beb
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I4db8cc713daaa14566b1f44dea0aab1aa01c8ce5
2020-08-15 02:08:58 +00:00
Yi-Ling Chuang
c248da2974
[DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I76c77c66be5da635571f876d9b76906f789e8472
2020-08-15 02:08:57 +00:00
Yi-Ling Chuang
4d6f8bf34d
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: I33d8794e09209d66eb4c9a53a903d18f44ceddbb
2020-08-15 02:08:55 +00:00
Yi-Ling Chuang
631465df31
[DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231
Change-Id: Iefb77041715dba0cc2a19210e1353f935e25a8a8
2020-08-15 02:08:53 +00:00
Yi-Ling Chuang
ec05383478
Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: I7b1bb3f970e12b67608dc2d734a2906099716804
2020-08-15 02:08:44 +00:00
Jason Chiu
4113bf12d0
[DO NOT MERGE] Update contextual cards display mechanism am: b824187524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Iaf3bcd4f531d7a82aa78c5eba12b44192e3b7df8
2020-08-15 02:08:43 +00:00
Yi-Ling Chuang
f07366ff12
Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: I93636856e4cbe4e764c7f890ea0e05c810086827
2020-08-15 02:08:38 +00:00
Jason Chiu
68173c1343
[DO NOT MERGE] Update contextual cards display mechanism am: b824187524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226
Change-Id: Ia3f637ea89d7209cfdbc1a97238e4bfb6d66d77f
2020-08-15 02:08:34 +00:00
Yi-Ling Chuang
8c3987b907
Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev
2020-08-15 01:56:27 +00:00