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
ca7d97c2ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb
-s ours am: 4c5836ae3c
-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: I917a5e11c05def15c019110b1d9689ec562eb629
2020-08-14 16:41:39 +00:00
TreeHugger Robot
7d6ba6a253
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb
-s ours am: b7af3be0a2
-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: Id4db9540e9efd78af00b5b68729c59b70803c043
2020-08-14 16:40:28 +00:00
TreeHugger Robot
4c5836ae3c
[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: Iefc7c31c26740eddc63cb8a16604ea7102e7ad14
2020-08-14 16:23:58 +00: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
a716d48ffc
Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820
am: af57413abc
am: 45cc4bbe61
am: 454bcb012e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398
Change-Id: I2cdf575a7aeb63c28508578588ad36c8154428df
2020-08-14 08:56:55 +00: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
d59705b1ea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc
-s ours am: c0e5d4d545
-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: Ia4ee8a0a2e7a5aefb1d3c17f945baeb93c4e5568
2020-08-14 07:37:00 +00:00
Bill Yi
68e8b007c7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc
-s ours am: 83bf17ce56
-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: Ie8139461fd967bfbea45342178e4db58a2a3f147
2020-08-14 07:29:10 +00:00
TreeHugger Robot
64462c12e6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 18e427260d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12375655
Change-Id: I460a8c803884d60adec281729d09372aab9122c0
2020-08-14 07:29:03 +00:00
Bill Yi
83bf17ce56
[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: I74ad57626a98bd94ea5d988b4f882a724040d3ab
2020-08-14 07:20:25 +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
TreeHugger Robot
18e427260d
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-08-14 07:18:13 +00:00
Bill Yi
6415c5b511
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If17aadb947be94b348718f1cfb72d743468df69c
2020-08-14 05:02:26 +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
Jeffrey Carlyle
7a7a55c1a4
Merge "Add BatteryStatusFeatureProvider" into rvc-qpr-dev am: d553d434cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12153212
Change-Id: I36bc3699d0af28ad40e52fd11946ae3222eb90a4
2020-08-14 03:03:20 +00:00
Jeffrey Carlyle
d553d434cd
Merge "Add BatteryStatusFeatureProvider" into rvc-qpr-dev
2020-08-14 02:32:05 +00:00
Zhen Zhang
c1b516b2c1
Merge "Update subtext of Ethernet Tethering preference" into rvc-qpr-dev am: b49bd3592e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12363010
Change-Id: I9d867fcfa8e3af30dfbfdb2a7990950b4443b2e6
2020-08-13 23:45:39 +00:00
Zhen Zhang
b49bd3592e
Merge "Update subtext of Ethernet Tethering preference" into rvc-qpr-dev
2020-08-13 23:31:01 +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
Jackal Guo
c6d3501a70
[automerger skipped] Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438
am: e8b8d9917a
-s ours am: 37448ae2ae
am: 9928eff933
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396
Change-Id: I6d5b6251c52b9d53902691ccafcfcc5ecacac364
2020-08-13 10:09:45 +00: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
Bonian Chen
5d9d199615
[automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e
am: 4fc5e348bf
-s ours am: 8eb932b5b1
-s ours am: 00e8b63d0f
-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: Ifea57b05ebc568110ff421ec9d0f3264aa5cf5ca
2020-08-13 09:41:26 +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
Arc Wang
8df77fd7a3
Merge "[Wi-Fi] Fix crash after editing invalid hotspot password" into rvc-qpr-dev am: b6a9493804
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12355969
Change-Id: Ibe5882d260907654e8c8891a4e65fb73e9e39730
2020-08-13 09:06:17 +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
Arc Wang
b6a9493804
Merge "[Wi-Fi] Fix crash after editing invalid hotspot password" into rvc-qpr-dev
2020-08-13 08:52:27 +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
5278ed8be1
[automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b
am: 5c21396034
-s ours am: ce259b61f6
-s ours am: bdd022172e
-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: I0d8fcdf66e7c9d664c75525cce723e4f83d15bc5
2020-08-13 05:28:58 +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
Bonian Chen
5c21396034
Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398389
Change-Id: Ib8e712b0416e24857b1e2d1203cf22bd12ba4786
2020-08-13 04:43:30 +00:00
Bonian Chen
3b8794d16b
Merge "[Settings] Replace getSimCount() API"
2020-08-13 04:27:36 +00:00
Bonian Chen
5560882548
[Settings] Replace getSimCount() API
...
Change design of monitor change in Settings.Global.MOBILE_DATA and
Settings.Global.DATA_ROAMING in order to avoid from accessing
getSimCount().
Bug: 144251589
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RoamingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
Merged-In: I965a0c07c7c9ef5897b33809bae6a7921977db18
Change-Id: I8010f74c41826b081aa9f599d33a9519a1888215
2020-08-13 10:56:55 +08:00
Zhen Zhang
75028dd946
Update subtext of Ethernet Tethering preference
...
Update the subtext summary according to UX
Bug: 153761463
Test: built successfully; manually test
Change-Id: I96d1a1f5111f85ee4b10f61ab4408822b99032e1
2020-08-12 16:13:48 -07:00
Lucas Dupin
7925b0c044
Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1
am: 01cb6c4a20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522
Change-Id: I570f25117a12b55046dac45c086693e859e2cc6c
2020-08-12 22:08:40 +00:00
Lucas Dupin
6430a4b88f
Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1
am: 5f44b7cf54
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522
Change-Id: I7f2ae48cbdcad2fa44d96382b7d2c175b7605f59
2020-08-12 22:07:32 +00:00