Bill Yi
5f549433a6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibe77ec8b7ad9f52fe7b5fc7514fe7eab0bf02f6a
2020-08-19 23:23:41 +00:00
TreeHugger Robot
b72f1f5475
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12407164
Change-Id: Ie03b90f093eaedc84b8845b4cae9b08ea337eeeb
2020-08-19 16:19:22 +00:00
TreeHugger Robot
1c9f9d50cf
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev
2020-08-19 16:09:20 +00:00
Treehugger Robot
ece108cc9a
Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517
am: e40251b9f5
am: af6dfc4b8c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083
Change-Id: I7912e42f3ddc32e6470790b97c983b561906ffaf
2020-08-19 15:18:31 +00:00
Treehugger Robot
af6dfc4b8c
Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517
am: e40251b9f5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083
Change-Id: I32affa3deffca49e15bdeb9792bb995c00cb58f6
2020-08-19 15:08:01 +00:00
Treehugger Robot
e40251b9f5
Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083
Change-Id: Iad9e0eb16478e12ff2e5340c34bb8cc4ba5ece3e
2020-08-19 14:56:13 +00:00
Treehugger Robot
16503cf517
Merge "Settings: Fix exception in about phone during SIM swap"
2020-08-19 14:47:21 +00: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
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
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
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
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
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
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
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
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
Yi-Ling Chuang
51f80cb3ed
Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev
2020-08-15 01:56:05 +00:00
Peiyong Lin
9511d443cb
Rename game driver to updatable driver.
...
Game driver is considered a production name. We should use the term
updatable driver instead of the production name.
Bug: b/164449016
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GraphicsDriver
Change-Id: I2237dfb22ecd94bc2475249b1460796ac1693d81
2020-08-14 16:29:03 -07:00
TreeHugger Robot
b7af3be0a2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12377408
Change-Id: Id3710c913387095a46dde8b67437b2f1e2d823e0
2020-08-14 16:22:21 +00:00
TreeHugger Robot
c9e69937bb
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev
2020-08-14 16:04:34 +00:00
Bill Yi
ff5cca6a6b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I241aeb3750d6a38ad8ed37f53ef5a75041501efe
2020-08-14 06:08:19 -07:00
Bonian Chen
454bcb012e
Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820
am: af57413abc
am: 45cc4bbe61
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398
Change-Id: I65d1b2561a86542bd1cccd95f0e69b6b4ee594fe
2020-08-14 08:41:51 +00:00
Bonian Chen
45cc4bbe61
Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820
am: af57413abc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398
Change-Id: I1e5921c9a4cc5b223d0ee61eae2cac7afaa19e2a
2020-08-14 08:20:48 +00:00
Bonian Chen
af57413abc
Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398
Change-Id: I5617a1d70e38aa39ec37ace07bce0d5fda699729
2020-08-14 08:05:12 +00:00
Bonian Chen
33e4971820
Merge "[Settings] Grant permissions to submit junit test"
2020-08-14 07:45:50 +00:00
Bill Yi
c0e5d4d545
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12375648
Change-Id: I191732742fe617ce8584ae1dffd345c4e7985843
2020-08-14 07:19:04 +00:00
Bill Yi
5512b2f2dc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6385dcbd99493b0ccc9e8dff10e42bc738dd3c13
2020-08-14 04:27:09 +00:00
Bonian Chen
1c97e70641
[Settings] Grant permissions to submit junit test
...
Grant permissions for adding new Junit test case.
Change-Id: Iabde2307669815fd50cdba241492c82b9e2cf64d
2020-08-13 18:49:31 +08:00
Jason Chiu
b824187524
[DO NOT MERGE] Update contextual cards display mechanism
...
1. Make Wi-Fi card default to collapse.
2. Support showing a default card when there's no displayable card.
3. Solve the problem of icon not showing for cached slices in card
renderer
Bug: 163288869
Fixes: 159092915
Test: manual, robotest
Change-Id: Ie8b61ad58410337334e29b7a794353b0c6a6ba8c
2020-08-13 17:58:55 +08:00
Jackal Guo
9928eff933
[automerger skipped] Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438
am: e8b8d9917a
-s ours am: 37448ae2ae
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396
Change-Id: I7f420c6ae54685d42039a19223ce1c27060a16be
2020-08-13 09:52:33 +00:00
Jackal Guo
37448ae2ae
[automerger skipped] Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438
am: e8b8d9917a
-s ours
...
am skip reason: skipped by user jackalguo
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396
Change-Id: Ia3b8566a3fa72c7cf45501d1610c183bcc6ee7be
2020-08-13 09:32:19 +00:00
Bonian Chen
00e8b63d0f
[automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e
am: 4fc5e348bf
-s ours am: 8eb932b5b1
-s ours
...
am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f84
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398391
Change-Id: I9aa4c9e5995037bfa5ad5ace90889d430993dd27
2020-08-13 09:25:07 +00:00
Bonian Chen
8eb932b5b1
[automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e
am: 4fc5e348bf
-s ours
...
am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f84
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398391
Change-Id: I22f62a4e0a0474cf9ead4d1ed38090b28bf0b243
2020-08-13 09:14:05 +00:00
Jackal Guo
e8b8d9917a
Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396
Change-Id: I7fc418fd2abb11be330b2b7f2139d5d44307b3d1
2020-08-13 08:56:03 +00:00
Bonian Chen
4fc5e348bf
Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398391
Change-Id: Icf8d0db6ffb41041652ae27f0573da2f118465c3
2020-08-13 08:55:56 +00:00
Jackal Guo
d7f05b5438
Merge "Revert "[Settings] Refactor PhoneStateListener""
2020-08-13 08:52:47 +00:00
Jackal Guo
765fb8293d
Revert "[Settings] Refactor PhoneStateListener"
...
This reverts commit e01df59027
.
Reason for revert: b/163995409 | Build failure.
Change-Id: Ia413a4bae93055ceca5b6aa85602c84a8fbe5424
2020-08-13 08:48:31 +00:00
Bonian Chen
7903cf872e
Merge "[Settings] Refactor PhoneStateListener"
2020-08-13 08:13:25 +00:00
Bonian Chen
bdd022172e
[automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b
am: 5c21396034
-s ours am: ce259b61f6
-s ours
...
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398389
Change-Id: Ibb972bf5b76ae57ff451fe2ee65d312fcf388956
2020-08-13 05:14:59 +00:00
Bonian Chen
e01df59027
[Settings] Refactor PhoneStateListener
...
Remove Looper and update of mSubId
Bug: 144542981
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Merged-In: Ie6ae5b5914322644f2655e585b03a6b685bbc84a
Change-Id: I5306b3a80220c02d2de1b25f20e8ef7f845e9a09
2020-08-13 13:02:04 +08:00
Bonian Chen
ce259b61f6
[automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b
am: 5c21396034
-s ours
...
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398389
Change-Id: I219267b4f2b50f71acf7065aa58478d382472ddf
2020-08-13 04:57:28 +00:00