Commit Graph

79653 Commits

Author SHA1 Message Date
Adam Bookatz
450a598494 Merge "fuelgauge OWNERS eof newline merge conflict" 2021-02-24 01:50:22 +00:00
Chiachang Wang
b7f1c84f5b Merge "Replace subnet mask calculation to Inet4AddressUtils" am: 78b260f5fe am: 12eadd2133
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic639b459a37a4dcb90a11a2df39455143316fb5d
2021-02-24 01:43:29 +00:00
TreeHugger Robot
6731f0eb7a Merge "Move LocationServicePreference to Location > LocationServices" into sc-dev 2021-02-24 01:41:25 +00:00
Chiachang Wang
18d056c2c1 [automerger skipped] Merge "Replace NetworkUtils methods" am: 3dd1c29aee am: 2fe30b6403 am: 54651567a8 -s ours am: dabe7775b1 -s ours
am skip reason: Change-Id I2fb674e0d7da0b11ba70177853fd6259bce372a3 with SHA-1 384b88e3fb is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1571848

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I514a20c5800073cb7429ac5ce7becf666db99765
2021-02-24 01:25:56 +00:00
Treehugger Robot
c309ada683 Merge "Owners updates" am: 395caa5fa6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597956

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e1aff62b059325bf4069f4bbca35b074dabe976
2021-02-24 01:22:19 +00:00
Chiachang Wang
12eadd2133 Merge "Replace subnet mask calculation to Inet4AddressUtils" am: 78b260f5fe
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86fde55123d8f7e28c6ed6c37cd6c05373920684
2021-02-24 01:18:05 +00:00
Chiachang Wang
dabe7775b1 [automerger skipped] Merge "Replace NetworkUtils methods" am: 3dd1c29aee am: 2fe30b6403 am: 54651567a8 -s ours
am skip reason: Change-Id I2fb674e0d7da0b11ba70177853fd6259bce372a3 with SHA-1 384b88e3fb is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1571848

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I079e582f6235b21f4c9d5abcc8727ff3e2350e37
2021-02-24 01:08:24 +00:00
Chiachang Wang
54651567a8 Merge "Replace NetworkUtils methods" am: 3dd1c29aee am: 2fe30b6403
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1571848

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I129c82cfe5667d29a7a988732e372b45f7fb6b98
2021-02-24 00:39:41 +00:00
Chiachang Wang
2fe30b6403 Merge "Replace NetworkUtils methods" am: 3dd1c29aee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1571848

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4419b7cc320726dbac4c324f6ce5c42434322fc7
2021-02-24 00:16:42 +00:00
Julia Reynolds
f2a444328c Adding notification team members to notification directory
Change-Id: Ie51b4b4ac69843b3a68957e03462d1b226abbdc0
2021-02-23 18:54:59 +00:00
TreeHugger Robot
1a2aae06b6 Merge "Decode URI in RequestManageCredentials" into sc-dev am: 6977d42c2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13676771

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c67b209594d43d457ffe91edbdb09dec173a8cf
2021-02-23 18:00:43 +00:00
TreeHugger Robot
6977d42c2a Merge "Decode URI in RequestManageCredentials" into sc-dev 2021-02-23 17:30:43 +00:00
Alex Johnston
b77e2b4f69 Decode URI in RequestManageCredentials
* URI should be human readable and not
  in percent-encoded form

Manual Testing steps
* Install TestDPC
* Select preference Request to manage credentials
* Verify activity displays URIs in a human
  readable format

Bug: 177900145
Test: Manual testing
Change-Id: I7b5f92f4939491a40bc3728aab56e06886fc08f1
2021-02-23 15:56:33 +00:00
ryanlwlin
4806a38516 Add uninstall option in the capabilities confirm dialog
Uninstall option is visible only when the application of the
service is not system App. It provides an efficient way to
uninstall the App if users are shocked with the perimssions
they need to grant.

Bug: 176877955
Test: Install an App with AccessibilityService and uninstall
it with this option.

Change-Id: I6b60cc56d8d34c2983458a676b500035551ec9df
2021-02-23 20:43:27 +08:00
Xin Li
87d82ee836 [automerger skipped] Merge ab/7061308 into stage. am: ad3fa60e26 -s ours am: 7c297fa38a -s ours am: 8767313e05 -s ours
am skip reason: Change-Id I35fe00aeeb112d5d9971985619e3ec5095dcdb7b with SHA-1 8e18b5b69d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13657604

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd88f43aa09a9355f71762f668928822d3d73060
2021-02-23 11:35:16 +00:00
Xin Li
8767313e05 [automerger skipped] Merge ab/7061308 into stage. am: ad3fa60e26 -s ours am: 7c297fa38a -s ours
am skip reason: Change-Id I35fe00aeeb112d5d9971985619e3ec5095dcdb7b with SHA-1 8e18b5b69d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13657604

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d9b48478314d125c5d1db99ac28d97486e2f06d
2021-02-23 10:34:10 +00:00
tom hsu
0361c7b4c0 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.
    - https://screenshot.googleplex.com/8pfQinjya2NJWoV
Bug: 180475805
Test: Maunal test with ATT SIM.
Change-Id: Ic14121d7ce2a53b0f883a0637fc390c2aa4dd1d7
Merged-In: Iae6943971c0cc6d31dc0e9d4dd97e850117adbfd
2021-02-23 10:32:13 +00:00
Treehugger Robot
395caa5fa6 Merge "Owners updates" 2021-02-23 09:17:58 +00:00
Xin Li
7c297fa38a [automerger skipped] Merge ab/7061308 into stage. am: ad3fa60e26 -s ours
am skip reason: Change-Id I35fe00aeeb112d5d9971985619e3ec5095dcdb7b with SHA-1 8e18b5b69d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13657604

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3a2aa451dcf23ec4e2b00b48e35d14542a34187
2021-02-23 09:05:06 +00:00
Stanley Wang
86cc0579f3 Replace the SwitchBar with MainSwitch.
- Update wi-fi calling switch.
- Update the switches in Accessibility

Fix: 178673860
Fix: 177968565
Test: Run robotest and apply the widget in Settings and see the ui
Change-Id: Id10e6a110f418ea500a2eaf3c54752bef4f36507
2021-02-23 16:21:52 +08:00
Chiachang Wang
78b260f5fe Merge "Replace subnet mask calculation to Inet4AddressUtils" 2021-02-23 07:28:31 +00:00
Mill Chen
8f26a8b835 Merge "Add collapsing toolbar to Notification history page" into sc-dev am: 8308928a89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13495592

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5dab40032cddd1b73d65737eb8d91b9613bb154f
2021-02-23 07:06:11 +00:00
Wesley.CW Wang
0a37d3c1c9 Remove "Battery optimization" from Special app access page am: 3e31334065
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13660505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6eda8cb66797b380125df7c7fe544af52dea5472
2021-02-23 07:05:48 +00:00
Mill Chen
8308928a89 Merge "Add collapsing toolbar to Notification history page" into sc-dev 2021-02-23 06:58:58 +00:00
Wesley.CW Wang
3e31334065 Remove "Battery optimization" from Special app access page
Bug: 179459867
Test: make RunSettingsRoboTests -j40
Change-Id: I715694289f4d893c4606446c0bc9a0bd21bafe7b
2021-02-23 06:10:51 +00:00
Chiachang Wang
dadf494123 Merge "Replace subnet mask calculation to Inet4AddressUtils" into sc-dev am: 65c570117e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13668406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib87ada4490ab108baee095eeb47de698ab8ff78c
2021-02-23 05:57:47 +00:00
Chiachang Wang
65c570117e Merge "Replace subnet mask calculation to Inet4AddressUtils" into sc-dev 2021-02-23 05:12:54 +00:00
Colin Cross
7c24460d6a Merge "Build Settings-robo-testutils for use by SettingsGoogleRoboTests" into rvc-qpr-dev-plus-aosp am: d7f340d5b2 am: 3ed989b264
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13630935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iea067031763f5b3f65b2f86e625277915807f253
2021-02-23 04:59:22 +00:00
Colin Cross
01fead1153 Merge "Export proguard.flags, manifest and sources for use by SettingsGoogle" into rvc-qpr-dev-plus-aosp am: 81062029dd am: f5035388fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13630934

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5976a511f56841b5a168da85e5dbac61a2cf61d5
2021-02-23 04:58:57 +00:00
Colin Cross
3ed989b264 Merge "Build Settings-robo-testutils for use by SettingsGoogleRoboTests" into rvc-qpr-dev-plus-aosp am: d7f340d5b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13630935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7e17c48702e5452e37df11cdcb43d297bdbb61f
2021-02-23 04:36:44 +00:00
Colin Cross
f5035388fc Merge "Export proguard.flags, manifest and sources for use by SettingsGoogle" into rvc-qpr-dev-plus-aosp am: 81062029dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13630934

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f7ae37bc028f422f5c50bef421613ccfc49811a
2021-02-23 04:36:06 +00:00
TreeHugger Robot
05089a9491 Merge "Fix broken test" into sc-dev am: efbf7d4f07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13639636

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id519f9512b113f30b8a45a11dbae8f773826a0ad
2021-02-23 04:33:54 +00:00
Colin Cross
f7a19e77a4 Merge changes from topic "SettingsGoogle-bp-rvc-qpr-dev-plus-aosp" into sc-dev am: e1cd3ba760
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13630935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30fbb0441ccb95c13818385a240da92c3e167ea3
2021-02-23 04:33:20 +00:00
Colin Cross
e884797695 Merge changes from topic "SettingsGoogle-bp-rvc-qpr-dev-plus-aosp" into sc-dev am: ce44abb97d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13630934

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0f7f10a50efab04bbec161ebe41759b979542d5
2021-02-23 04:33:18 +00:00
TreeHugger Robot
efbf7d4f07 Merge "Fix broken test" into sc-dev 2021-02-23 04:19:24 +00:00
Colin Cross
e1cd3ba760 Merge changes from topic "SettingsGoogle-bp-rvc-qpr-dev-plus-aosp" into sc-dev
* changes:
  [automerge] Build Settings-robo-testutils for use by SettingsGoogleRoboTests 2p: dc7bc483a3
  Build Settings-robo-testutils for use by SettingsGoogleRoboTests
2021-02-23 04:12:51 +00:00
Colin Cross
ce44abb97d Merge changes from topic "SettingsGoogle-bp-rvc-qpr-dev-plus-aosp" into sc-dev
* changes:
  [automerge] Export proguard.flags, manifest and sources for use by SettingsGoogle 2p: 38d3b0fa18
  Export proguard.flags, manifest and sources for use by SettingsGoogle
2021-02-23 04:12:51 +00:00
Colin Cross
d7f340d5b2 Merge "Build Settings-robo-testutils for use by SettingsGoogleRoboTests" into rvc-qpr-dev-plus-aosp 2021-02-23 04:12:50 +00:00
Colin Cross
81062029dd Merge "Export proguard.flags, manifest and sources for use by SettingsGoogle" into rvc-qpr-dev-plus-aosp 2021-02-23 04:12:50 +00:00
Mingguang Xu
94ab80cdbc Merge "Set Wifi scoring status when Adaptive Connectivity toggle status changes" into sc-dev am: 9a46cfcfa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13486381

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d529edbe6cb1d46a1a7b2132b783c4265278465
2021-02-23 03:11:00 +00:00
Chiachang Wang
eb20f4b06f Replace subnet mask calculation to Inet4AddressUtils
There is existing helper method in Inet4AddressUtils to calculate
the subnet mask from IPv4 prefix calculation. Replace the
implementation in caller side to simplify design in callers.

Bug: 172183305
Test: atest SettingsRoboTests
Test: Verify the method return the same value
Change-Id: I38d7d09be612fa4788cf4052bf304d17f0ae79f4
Merged-In: I38d7d09be612fa4788cf4052bf304d17f0ae79f4
2021-02-23 03:09:11 +00:00
Chiachang Wang
17a8eacab4 Replace subnet mask calculation to Inet4AddressUtils
There is existing helper method in Inet4AddressUtils to calculate
the subnet mask from IPv4 prefix calculation. Replace the
implementation in caller side to simplify design in callers.

Bug: 172183305
Test: atest SettingsRoboTests
Test: Verify the method return the same value
Change-Id: I38d7d09be612fa4788cf4052bf304d17f0ae79f4
2021-02-23 03:05:51 +00:00
Mingguang Xu
9a46cfcfa0 Merge "Set Wifi scoring status when Adaptive Connectivity toggle status changes" into sc-dev 2021-02-23 02:31:41 +00:00
Chiachang Wang
3dd1c29aee Merge "Replace NetworkUtils methods" 2021-02-23 00:58:59 +00:00
Alex Salo
a9f20366e3 Merge "Promotes screen timeout setting." into sc-dev am: 5315f373fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13659177

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54dc3ce8d4879fa8e302aba6088e76c288d2874f
2021-02-22 21:10:10 +00:00
Yu-Han Yang
e93c1298fc Move LocationServicePreference to Location > LocationServices
Bug: 180533061
Test: manual on device
Change-Id: Idd700f5c530af67f4936e207e42988267185f256
2021-02-22 11:49:14 -08:00
Mingguang Xu
107baf6216 Set Wifi scoring status when Adaptive Connectivity toggle status changes
Bug: 177440342

Test: make RunSettingsRoboTests
Test: manual

Signed-off-by: Mingguang Xu <mingguangxu@google.com>
Change-Id: Ic0a3ce834c9a55a8eab702b82adb4d27642ca543
2021-02-22 10:57:30 -08:00
Alex Salo
5315f373fa Merge "Promotes screen timeout setting." into sc-dev 2021-02-22 18:40:59 +00:00
Manish Singh
06732582ff Merge "Introduce controller for transcode notifications" into sc-dev am: 4b0a19f44e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13556052

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39e21d46537a06d273230da9dcdac3ec844f657d
2021-02-22 18:02:11 +00:00
Manish Singh
4b0a19f44e Merge "Introduce controller for transcode notifications" into sc-dev 2021-02-22 17:39:43 +00:00