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
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
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
cb2c6bf3fa
Merge "Use EmergencyNumberUtils to get/set emergency settings." into sc-dev
2021-02-19 21:59:16 +00:00
Julia Reynolds
44e53efb52
Merge "Fix exception sorting conversations" into sc-dev
2021-02-19 19:43:01 +00:00
Julia Reynolds
85511dbef8
Fix exception sorting conversations
...
Test: robotests
Fixes: 178618139
Change-Id: I524187a5840163d65dce35827785f3139b6fede7
2021-02-19 13:22:31 -05:00
TreeHugger Robot
afaee1a202
Merge "Reorder the new notification settings page" into sc-dev
2021-02-19 16:46:53 +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
f92211eb6f
Merge "Show VoiceInput settings at all times" into sc-dev
2021-02-19 14:16:20 +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
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
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
1ebb7fa010
Merge "[Provider Model] UI wording change" into sc-dev
2021-02-19 04:12:32 +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
TreeHugger Robot
188061ba81
Merge "Begin transition from BatteryStatsHelper to BatteryUsageStats API." into sc-dev
2021-02-19 01:31:18 +00:00
Bob Badour
358e0966fc
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings" am: 7d8e27cbb5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1588487
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If1b8c547ca8fd066ab2a826e7dc9b53356fb811b
2021-02-19 00:58:34 +00:00
TreeHugger Robot
bb9f578c9b
Merge "Revert "Use location access for recent location apps."" into sc-dev
2021-02-19 00:56:15 +00:00
Bob Badour
7d8e27cbb5
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings"
2021-02-18 23:43:49 +00:00
Dmitri Plotnikov
97b3325ece
Begin transition from BatteryStatsHelper to BatteryUsageStats API.
...
For now, keep both BatteryStatsHelper and BatteryUsageStats in play.
The plan is to transition from the former to the latter, one usage
at a time. When all is said and done, all references to
BatteryStatsHelper will be gone.
Bug: 173745486
Test: atest --host SettingsRoboTests
Change-Id: I37e1dfff0043b1845992f18d72067bb547bb69ff
2021-02-18 11:56:00 -08:00
Alex Salo
a1615409c7
Merge "Check for available rotation resolver service and camera permission before showing setting for face based auto-rotation" into sc-dev
2021-02-18 18:11:33 +00:00
Treehugger Robot
9561f091e1
[automerger skipped] Merge changes I62c58967,I1dd57fa2 am: 20e39131c9 am: 72b557ac6a am: d558605aeb -s ours
...
am skip reason: Change-Id I62c589679052b276927d057d3d5d084bbfb57626 with SHA-1 cacf9aa485 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1593774
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I97017df7c6a222880da0c83da29c3876ebf8ac83
2021-02-18 17:46:32 +00:00
Lorenzo Colitti
2d6fc470ef
[automerger skipped] Stop using ConnectivityManager for VPNs. am: 1434c08600 am: cd7a7d20a1 am: 927ff0169f -s ours
...
am skip reason: Change-Id I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff with SHA-1 5c9a042370 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1592132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I27a49c8a958d4823efae43fe62e0171f500f4ba9
2021-02-18 17:46:29 +00:00
Wei Wang
5da4f381a6
Revert "Use location access for recent location apps."
...
This reverts commit f383cb44b4 .
Reason for revert: crashes on work profiles (http://b/180516388 )
Change-Id: Iff499e6a1439b6ecb524a61a9a88fe253799a131
2021-02-18 17:18:20 +00:00
Treehugger Robot
d558605aeb
Merge changes I62c58967,I1dd57fa2 am: 20e39131c9 am: 72b557ac6a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1593774
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I216766fc245cdefacda920dcdde56c0d50f6d6b6
2021-02-18 17:09:56 +00:00
Lorenzo Colitti
927ff0169f
Stop using ConnectivityManager for VPNs. am: 1434c08600 am: cd7a7d20a1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1592132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie612e6ca5f73330b99f64054a718500647100f42
2021-02-18 17:09:55 +00:00
Treehugger Robot
72b557ac6a
Merge changes I62c58967,I1dd57fa2 am: 20e39131c9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1593774
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibae0be639bd6f0a4af5cc108d750c5f77321e6d7
2021-02-18 16:53:39 +00:00
Lorenzo Colitti
cd7a7d20a1
Stop using ConnectivityManager for VPNs. am: 1434c08600
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1592132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I963c04fcf90280bc96a5daa8170dad772a5db955
2021-02-18 16:53:28 +00:00
TreeHugger Robot
cdcd94919c
Merge "Fix broken tests" into sc-dev
2021-02-18 16:27:10 +00:00
Julia Reynolds
aafaacfae1
Reorder the new notification settings page
...
Test: manual
Fixes: 176317477
Change-Id: I7dd784c446d4443be72de96c5a7cea7929388c71
2021-02-18 10:59:25 -05:00
Treehugger Robot
20e39131c9
Merge changes I62c58967,I1dd57fa2
...
* changes:
Remove ConnectivityManager from EnterprisePrivacyFeatureProvider.
Stop using ConnectivityManager for VPNs.
2021-02-18 15:47:13 +00:00
Mill Chen
46cf90af0e
Remove search and help menu items from toolbar
...
Based on the Settings UI guideline, both of search and help menu items
will be removed from toolbar on Android S.
Bug: 179332520
Test: visual verified
1) Settings -> System -> Gestures -> System navigation
2) Observe the toolbar and check if search and help icons are existing
Change-Id: I3d71eddffb8876f936cf56858d0604aba7d4ee4b
2021-02-18 23:29:21 +08:00
Victoria Lestari
b0e707ee78
Show VoiceInput settings at all times
...
Change-Id: Ief3da88bd68d7bf6c41c6a01578e44e32aa63c82
Bug: 167599201
Tested: on device (https://screenshot.googleplex.com/5nbkXkXJuXrfEqQ , https://screenshot.googleplex.com/AueYfuExhG6pW2E )
2021-02-18 15:02:59 +00:00
Lorenzo Colitti
65128bab08
Remove ConnectivityManager from EnterprisePrivacyFeatureProvider.
...
It is only used in GlobalHttpPreferenceController. Move it there.
Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I62c589679052b276927d057d3d5d084bbfb57626
Merged-In: I62c589679052b276927d057d3d5d084bbfb57626
2021-02-18 23:51:11 +09:00
Lorenzo Colitti
1434c08600
Stop using ConnectivityManager for VPNs.
...
These methods have all moved to VpnManager.
Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
Merged-In: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
2021-02-18 23:50:59 +09:00
TreeHugger Robot
fcdd955dff
Merge "Restructure app info page" into sc-dev
2021-02-18 11:03:38 +00:00
Lorenzo Colitti
693fcb5913
Merge "Remove ConnectivityManager from EnterprisePrivacyFeatureProvider." into sc-dev
2021-02-18 10:45:22 +00:00
TreeHugger Robot
c9197ec51b
Merge "Stop using ConnectivityManager for VPNs." into sc-dev
2021-02-18 10:28:19 +00:00
Tsung-Mao Fang
772477af1c
Fix broken tests
...
1) Remove AssistantFeedbackPreferenceController since it didn't use.
2) Refine the AssistantFeedbackPreferenceControllerTest, we need to use
vpn manager object now. (See ag/13519006)
Test: Run robo test
Fix: 180576544
Change-Id: I719711d83201d571427b9f46a6026e0831cddab6
2021-02-18 10:23:25 +00:00
Weng Su
64cf59bad3
[Provider Model] UI wording change
...
- Update the summary of Ethernet network
"To switch networks, disconnect ethernet"
- Update the summary of data usage for non-carrier networks
"Excludes data used by carrier networks"
- Update the title of Network preferences
"Network preferences"
- Screenshot:
https://screenshot.googleplex.com/62URXVwUJbSXKko
https://screenshot.googleplex.com/AeZDG2HmkmUkeHd
Bug: 178473018
Bug: 178474159
Bug: 178886957
Test: manual test
Change-Id: Id9ed11ed5cc2db329556bf64a13f21999dcdb151
2021-02-18 18:22:19 +08:00
Weng Su
a4fa394b07
Merge "Fix WiFi show "Not connected" always issue" into sc-dev
2021-02-18 09:55:18 +00:00
TreeHugger Robot
178081cf83
Merge "Change SIM dialog activity theme" into sc-dev
2021-02-18 09:18:37 +00:00
Lorenzo Colitti
cacf9aa485
Remove ConnectivityManager from EnterprisePrivacyFeatureProvider.
...
It is only used in GlobalHttpPreferenceController. Move it there.
Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I62c589679052b276927d057d3d5d084bbfb57626
2021-02-18 16:44:53 +09:00
Jiashen Wang
e74e93b31e
Merge "Fix the notification issue after pSIM is auto enabled" into sc-dev
2021-02-18 07:12:31 +00:00
Lorenzo Colitti
5c9a042370
Stop using ConnectivityManager for VPNs.
...
These methods have all moved to VpnManager.
Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
2021-02-18 16:02:08 +09:00