PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,585 Commits 1 Branch 0 Tags
4a0ddee053b3c54fa1dcb410c1ef686cb8952c7c
Commit Graph

79585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Bookatz
4a0ddee053 [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: I08ea4022a74fcc0dd327dc3691ec599e6e4f9e6f
 2021-02-20 18:27:07 +00:00
Treehugger Robot
87bd9a8179 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: I662b436248adf06a5b2956b5874fd99f9ef85385
 2021-02-20 18:26:38 +00:00
Lorenzo Colitti
3061f7f1c0 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: I7d209c095b6929961747e7506a3d98c5791d20f8
 2021-02-20 18:23:15 +00:00
Bob Badour
a20b01cc46 [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: I2adcd446d2f9c8805084b035b74d55525bb76415
 2021-02-20 18:07:40 +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
9ce3035190 [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: Ie3f3ffaa54204258d428620ec9012e90745dfb86
 2021-02-20 16:40:10 +00:00
TreeHugger Robot
71cc762f14 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 16:14:47 +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
Bill Yi
4e210b4e98 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0b5b56cd952b0e5183db9d051f0bb7650f7fc381
 2021-02-20 11:48:43 +00:00
Chiachang Wang
9058413fbd 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: Iea93c752aa6d25b0d1279ced1d0faf1017b3ece1
 2021-02-20 09:22:37 +00:00
Bonian Chen
1058528357 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: Ic7a6d4b5047f5b4d5f5e1097d266c054ac3e5faa
 2021-02-20 09:22:15 +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
d8b566aaee 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: I1ceafd0d230a8fd929f7cc752df715e40620ac62
 2021-02-19 22:03:30 +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
c50d045b0c 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: Id8438a053c8bdf668c90bc275100bc29f743cf91
 2021-02-19 20:41:47 +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
1e12e6a71f 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: Iac47748ccc1a79ea8c59371919fc6b7e99ca44fd
 2021-02-19 17:16:12 +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
60927a0192 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: I33f3f73109e0b23ca2318f244301ad32f79454ad
 2021-02-19 16:18:21 +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
5e6d0216cf 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: I05edf4bcc811d207229c1fba589a781778e4ec1c
 2021-02-19 15:06:39 +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
c71b55bdcb 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: Ic828efab8d450afd48b4be5cf2a0044d9973920b
 2021-02-19 10:32:51 +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
89e2e7a981 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: I4f5923b5732b4150fc8664e39b98cc5275a8414a
 2021-02-19 09:55:19 +00:00
SongFerng Wang
d296fbbd11 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: I99741e734cf735048b691c7fb8e38ff846086d4e
 2021-02-19 09:54:41 +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
befd6ba551 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: I30cac4af8c0618068403abe6ac1859f769f25fe7
 2021-02-19 04:38:28 +00:00
TreeHugger Robot
1ebb7fa010 Merge "[Provider Model] UI wording change" into sc-dev 2021-02-19 04:12:32 +00:00
TreeHugger Robot
ba92a30f69 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: I1907810c599d120ffac6a299455b73f94ab1db90
 2021-02-19 02:27:56 +00:00