Adam Bookatz
7aca7e8a88
[automerger skipped] Merge "Update new owners for battery pages." am: c2c5de6199 am: 9e3bb7026c am: 227d74be02 -s ours am: e71853e687 -s ours
...
am skip reason: Change-Id I330d074c6e504493abf4cece51199ec5851b5d3b with SHA-1 9a90dc1e8e is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1595832
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4ee0cf1c61c66c62c97c7f52ed3434648e196fe5
2021-02-20 18:26:08 +00:00
Treehugger Robot
b032ef3393
Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657 am: 00eaf3f7e0 am: fef782861a am: 26e6c1852c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1581223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I058c180e53fade9859bd14b1cd88720af70d62e1
2021-02-20 18:25:25 +00:00
Lorenzo Colitti
d7bbf96b04
Merge "Reset VPN settings by calling VpnManager." am: be4a0e84ef am: 9e072f09a0 am: e584f62ac4 am: 5320dbda4e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1594351
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I73ee4a3ab2c96f886d0dac18f834c5e74d7601de
2021-02-20 18:23:02 +00:00
Bob Badour
1bb0e0c6b6
[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings" am: 7d8e27cbb5 am: 358e0966fc am: cfcf58354c -s ours am: 5cdada2888
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1588487
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I512d78a9afc9f17e0209747093b0c69e226b889e
2021-02-20 18:08:00 +00:00
Adam Bookatz
e71853e687
[automerger skipped] Merge "Update new owners for battery pages." am: c2c5de6199 am: 9e3bb7026c am: 227d74be02 -s ours
...
am skip reason: Change-Id I330d074c6e504493abf4cece51199ec5851b5d3b with SHA-1 9a90dc1e8e is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1595832
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I374fc14a6caa59f3d09cfa421cb84cb582f1c1a0
2021-02-20 17:40:35 +00:00
Treehugger Robot
26e6c1852c
Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657 am: 00eaf3f7e0 am: fef782861a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1581223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I05a62b623436440c077018d11d6d27a1d3ec63f6
2021-02-20 17:40:26 +00:00
Lorenzo Colitti
5320dbda4e
Merge "Reset VPN settings by calling VpnManager." am: be4a0e84ef am: 9e072f09a0 am: e584f62ac4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1594351
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I24d89cb5138f86d86a0981b7580f52c50b70133b
2021-02-20 17:32:39 +00:00
Bob Badour
5cdada2888
[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings" am: 7d8e27cbb5 am: 358e0966fc am: cfcf58354c -s ours
...
am skip reason: skipped by user jeffv
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1588487
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie23e5f0ee4a9d4e4fb2a2afbc174818528862721
2021-02-20 17:22:59 +00:00
TreeHugger Robot
613ae2b291
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a48e464981 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13642064
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie9057e357cfadecf73718c8f021d1fdd1f27e42a
2021-02-20 16:37:35 +00:00
TreeHugger Robot
a48e464981
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-02-20 15:52:38 +00:00
Bill Yi
46865bb769
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9f3516fd312c8dc0048777e85934029ef6d5e086
2021-02-20 12:15:49 +00:00
Chiachang Wang
fced411231
Merge "Replace NetworkUtils methods" into sc-dev am: cb95bfdb16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13472810
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I634303e92c8c7ff46ceaf5231f59fc0021f38538
2021-02-20 09:22:55 +00:00
Bonian Chen
5a4815b06c
Merge "Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657" into sc-dev am: 9bad17d5e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13627529
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I375751209facea74ea083992ad88985ff283b07c
2021-02-20 09:22:23 +00:00
Chiachang Wang
cb95bfdb16
Merge "Replace NetworkUtils methods" into sc-dev
2021-02-20 08:41:45 +00:00
Bonian Chen
9bad17d5e8
Merge "Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657" into sc-dev
2021-02-20 08:29:58 +00:00
Fan Zhang
c3f12b1895
Merge "Use EmergencyNumberUtils to get/set emergency settings." into sc-dev am: cb2c6bf3fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13623844
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id759bdad54d9c286dae45bbd467e5682c29b56e5
2021-02-19 22:04:19 +00:00
Fan Zhang
cb2c6bf3fa
Merge "Use EmergencyNumberUtils to get/set emergency settings." into sc-dev
2021-02-19 21:59:16 +00:00
Julia Reynolds
ec61d3c2f7
Merge "Fix exception sorting conversations" into sc-dev am: 44e53efb52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13617198
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f0039d6973212bbe3bbda8479e4e93fb9e6d120
2021-02-19 20:41:21 +00:00
Julia Reynolds
44e53efb52
Merge "Fix exception sorting conversations" into sc-dev
2021-02-19 19:43:01 +00:00
Adam Bookatz
227d74be02
Merge "Update new owners for battery pages." am: c2c5de6199 am: 9e3bb7026c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1595832
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic7f02e3d702a6e0aa9425d8a1dd973d33ea3aa89
2021-02-19 18:57:56 +00:00
Julia Reynolds
85511dbef8
Fix exception sorting conversations
...
Test: robotests
Fixes: 178618139
Change-Id: I524187a5840163d65dce35827785f3139b6fede7
2021-02-19 13:22:31 -05:00
Adam Bookatz
9e3bb7026c
Merge "Update new owners for battery pages." am: c2c5de6199
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1595832
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1177d1ceb9c73e18bc203267931021bc908a8221
2021-02-19 18:18:50 +00:00
Adam Bookatz
c2c5de6199
Merge "Update new owners for battery pages."
2021-02-19 17:26:50 +00:00
TreeHugger Robot
d49dd1f099
Merge "Reorder the new notification settings page" into sc-dev am: afaee1a202
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13616954
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I03c2f0ca2f88cfcd858f4646de10513c0c3472fe
2021-02-19 17:20:25 +00:00
TreeHugger Robot
afaee1a202
Merge "Reorder the new notification settings page" into sc-dev
2021-02-19 16:46:53 +00:00
Tom Hsu
7e85a5acc6
Merge "Only default APN type can make preference selectable." into sc-dev am: 917021a2bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13622528
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icec5273d8018eac452c2439437a884de100b1cbd
2021-02-19 16:18:23 +00:00
Tom Hsu
917021a2bd
Merge "Only default APN type can make preference selectable." into sc-dev
2021-02-19 15:47:00 +00:00
Victoria Lestari
9bce6b6b03
Merge "Show VoiceInput settings at all times" into sc-dev am: f92211eb6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13471611
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5665724a58ec0ffb17efcf0010f1557b69ae40de
2021-02-19 15:07:07 +00:00
Victoria Lestari
f92211eb6f
Merge "Show VoiceInput settings at all times" into sc-dev
2021-02-19 14:16:20 +00:00
Wesley.CW Wang
970ce69524
Update battery percentage column to UsageProgressBarPref (1/2) am: f4bc35333b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13480087
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I439d45636be78e33953b7740cfa5873e617bf0ce
2021-02-19 10:33:01 +00:00
Wesley.CW Wang
f4bc35333b
Update battery percentage column to UsageProgressBarPref (1/2)
...
- Change battery percentage column to new design
- Remove debug info case
Screenshots:
https://screenshot.googleplex.com/9rvRfK3wBtpnarZ.png
https://screenshot.googleplex.com/5iAjNXTptDechAm.png
Bug: 177407113
Test: make RunSettingsRoboTests -j40
Change-Id: I5d046be29a036910036e72edb677b69bc2c0a03f
2021-02-19 10:23:53 +00:00
Treehugger Robot
b500638838
Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1581223
Bug: 179754915
Change-Id: Ic7975ae92fa2be360b20dfc4d18f4ad9af789ebe
(cherry picked from commit 00eaf3f7e0 )
2021-02-19 10:00:49 +00:00
TreeHugger Robot
70535c8316
Merge "Remove search and help menu items from toolbar" into sc-dev am: 2e47875c06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13610518
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia7fa09afaad9a86365b62dc681320458273466e1
2021-02-19 09:55:22 +00:00
SongFerng Wang
6d3a6920bb
Merge "Can't show 5GE at summary" into sc-dev am: 851a2f8557
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13622530
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I98b08f43ae43626fb349252bf47d147311969627
2021-02-19 09:55:09 +00:00
TreeHugger Robot
2e47875c06
Merge "Remove search and help menu items from toolbar" into sc-dev
2021-02-19 09:37:38 +00:00
SongFerng Wang
851a2f8557
Merge "Can't show 5GE at summary" into sc-dev
2021-02-19 09:24:12 +00:00
Treehugger Robot
fef782861a
Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657 am: 00eaf3f7e0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1581223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2792e10c7808d9a0d31c8b7136d60c594c4b2abf
2021-02-19 09:18:02 +00:00
Lorenzo Colitti
e584f62ac4
Merge "Reset VPN settings by calling VpnManager." am: be4a0e84ef am: 9e072f09a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1594351
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I09ebb58281e60c246550426b2b962a4dce6b72ad
2021-02-19 09:16:56 +00:00
Treehugger Robot
00eaf3f7e0
Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1581223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic7975ae92fa2be360b20dfc4d18f4ad9af789ebe
2021-02-19 09:04:14 +00:00
Treehugger Robot
b086fed657
Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON"
2021-02-19 08:53:56 +00:00
Lorenzo Colitti
9e072f09a0
Merge "Reset VPN settings by calling VpnManager." am: be4a0e84ef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1594351
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie4310decabc5f997e79a736b82581b8b47ed8b0d
2021-02-19 08:27:04 +00:00
Lorenzo Colitti
be4a0e84ef
Merge "Reset VPN settings by calling VpnManager."
2021-02-19 08:04:53 +00:00
SongFerngWang
35b4725975
Can't show 5GE at summary
...
The 5GE has HTML tag, so it should do transformation by Html.fromHtml.
Bug: 180053606
Test: atest ProviderModelSliceHelperTest.java
Change-Id: I32ac255d50c52ce853f686ac22572fa1cb44e9cd
2021-02-19 15:57:19 +08:00
tom hsu
9bd774a0b0
Only default APN type can make preference selectable.
...
- Current design is only to check mms type, but if there are other APN
types group in one apn settings, it will show the radio button and the
user can see the radio button and select it.
- Improvement: Only make APN setting with defalut APN type be able to be selected.
Bug: 180475805
Test: Maunal test with ATT SIM.
Change-Id: Iae6943971c0cc6d31dc0e9d4dd97e850117adbfd
2021-02-19 05:48:31 +00:00
Fan Zhang
f5819fc80c
Use EmergencyNumberUtils to get/set emergency settings.
...
EmergencyNumberUtils now contains centralized logic for interacting with
emergency gesture settings. Settings UI does not need to pay attention
to underlying data access, permission controler, etc etc.
Bug: 180236600
Test: robotests
Change-Id: If641ee36f237d153f1d790251af408969379a57a
2021-02-19 05:43:49 +00:00
TreeHugger Robot
56f2c8d3fc
Merge "[Provider Model] UI wording change" into sc-dev am: 1ebb7fa010
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13614888
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2ed7b88bacbe43fc6b4636a7043e0f44f4686c13
2021-02-19 04:39:09 +00:00
TreeHugger Robot
1ebb7fa010
Merge "[Provider Model] UI wording change" into sc-dev
2021-02-19 04:12:32 +00:00
TreeHugger Robot
f2d85d034f
Merge "Begin transition from BatteryStatsHelper to BatteryUsageStats API." into sc-dev am: 188061ba81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13593405
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6de9272fe70762adcfb1d4e4440dac307a3eae2
2021-02-19 02:28:08 +00:00
TreeHugger Robot
2d0f76035a
Merge "Revert "Use location access for recent location apps."" into sc-dev am: bb9f578c9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13617856
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4b6180fbf78d80644285a14c9464ad9571272749
2021-02-19 02:26:25 +00:00
Bob Badour
cfcf58354c
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings" am: 7d8e27cbb5 am: 358e0966fc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1588487
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9b93f42c5d78ce53819da38574f3b0433cc0efe6
2021-02-19 02:25:25 +00:00