PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,036 Commits 1 Branch 0 Tags
d2c2c9927a5282cff53bf37cd4f94d82506df88c
Commit Graph

80036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tom hsu
00798a5902 [Provider model] Show a string on internet picker when mobile data off 
- https://screenshot.googleplex.com/6JE9ma6UZmGCNFQ

Bug: 178680922
Test: Manual test passed
Test: atest passed
Change-Id: Id276e3f97b4380f648eb9e35ca7780a0ba32bdb2
 2021-02-20 15:03:47 +08:00
Bob Badour
0adbf158bc resolve merge conflicts of cfcf58354c to sc-dev 
Change-Id: I2134f96e3d7246e441fc1e05ca4c896b28a5d8e3
 2021-02-20 02:15:33 +00:00
Bob Badour
a37f7acb6e resolve merge conflicts of cfcf58354c to sc-dev 
Change-Id: If4ac23728393cf6d2855f54ac2030ccd605f4582
 2021-02-20 01:58:48 +00:00
Adam Bookatz
17e0708152 fuelgauge OWNERS eof newline merge conflict 
The AOSP version and internal version differ by an end-of-file newline,
which is creating merge conflicts.

Change-Id: Ib90a3ffbae9b44c3e6cf2287149f35318cd320a5
Test: N/A
Merged-In: I330d074c6e504493abf4cece51199ec5851b5d3b
 2021-02-20 00:23:45 +00:00
Ben Murdoch
38567b98d4 Correctly select peak refresh rate. 
Currently we will get an arbitrary value that is greater than the
default depending on the order returned by the Display.

Bug: 180723012
Test: make RunSettingsRoboTests
      ROBOTEST_FILTER="com.android.settings.display.PeakRefreshRatePreferenceControllerTest"
Change-Id: Id2c99f2bea9c6b2814d82a9db3a417e4a93ee06d
 2021-02-19 22:31:12 +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
Presubmit Automerger Backend
f68eb56cf5 [automerge] Export proguard.flags, manifest and sources for use by SettingsGoogle 2p: 38d3b0fa18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13630934

Change-Id: Ib371c7b6779f7e7ecde0e1eec489cc3a0672ed42
 2021-02-19 19:08:46 +00:00
Colin Cross
38d3b0fa18 Export proguard.flags, manifest and sources for use by SettingsGoogle 
This relands I3d2f042a9ebf4a6f551449904eb77a34f637f28f.

Bug: 175124789
Change-Id: I1cc3796f31e7db3d8f062436ebc618d93db19822
Test: m SettingsGoogle
Test: m RunSettingsGoogleRoboTests
 2021-02-19 19:08:36 +00:00
Presubmit Automerger Backend
50374e9fca [automerge] Build Settings-robo-testutils for use by SettingsGoogleRoboTests 2p: dc7bc483a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13630935

Change-Id: Ia09bd6400d821df84e72d00b8cc312edbee425ea
 2021-02-19 19:08:26 +00:00
Colin Cross
dc7bc483a3 Build Settings-robo-testutils for use by SettingsGoogleRoboTests 
This relands I385629c5c958e94ea289e88b0e65eb005006f4e3.

Bug: 175124789
Change-Id: Ib2cb9f4e080f4de6313d7dba3185709fd60130b7
Test: m RunSettingsGoogleRoboTests
 2021-02-19 19:08:17 +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
Mill Chen
51513522b3 Tweak UI for make profile pattern visible 
Removing the summary placeholder from Make profile pattern visible
preference, since this preference has nothing to show in its summary.

Bug: 180573775
Test: visual verified
1) Create a work profile through TestDPC
2) Settings -> Security -> disable Use one lock
3) Setting pattern for Work profile lock
4) Observe Make profile pattern visible and check if it's central
aligned

Change-Id: I66b828aa6f719cdefc6b81efcc3c2c9e54cdcaf1
 2021-02-20 00:35:05 +08: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
Mill Chen
8d0de3da05 Add collapsing toolbar to Notification history page 
On Android S, collapsing toolbar will be shown in each subsetting
pages. Notification history page doesn't have collapsing toolbar since
it's not a subsetting page. We changed the base activity for Notificatio
history page to eable the feature.

Bug: 178678690
Test: visual verified
1) Settings -> Notifications -> Notification history
2) Check if the collapsig toolbar is existig in this page

Change-Id: I51d66b64dc479bbe14274301c75da67600116772
 2021-02-19 18:00:20 +08: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
Thiébaud Weksteen
203b5203d9 Add onPreferenceChange_update tests 
Bug: 180688212
Test: atest -c Enable2gPreferenceControllerTest
Change-Id: Ie7bc7a49f2ce4d5e8b8d75914fa46b613569566f
 2021-02-19 09:24:02 +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
SongFerngWang
f91d9c40f2 Add OWNERS 
Bug: 179666288
Test: Build pass
Change-Id: I6e42f45083ee6dac9f0aeed4be71820107f4fd58
 2021-02-19 02:33:26 +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
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
a71afb5f91 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: I4d11a503a7eb6508f0cb10989fd000918f24fc69
 2021-02-19 02:23:16 +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