Treehugger Robot
e05e8065e7
Merge "Grant BatteryStats OWNERS for FakeUid.java" am: d8137193ae am: 59f43e5299 am: c7bd662dee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1584225
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ied3dab4b389ba8a83ccf8630eeb04c2fce962e48
2021-02-24 07:39:00 +00:00
Treehugger Robot
c7bd662dee
Merge "Grant BatteryStats OWNERS for FakeUid.java" am: d8137193ae am: 59f43e5299
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1584225
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic1d87849cf4c8c85f19858164faff1d17cf32d43
2021-02-24 06:59:58 +00:00
Treehugger Robot
59f43e5299
Merge "Grant BatteryStats OWNERS for FakeUid.java" am: d8137193ae
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1584225
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0d99ba0c146418dbca6fe190c02a7b52db2e85da
2021-02-24 06:07:30 +00:00
Stanley Wang
beefb25b48
Merge "Replace the SwitchBar with MainSwitch." into sc-dev
2021-02-24 06:04:03 +00:00
Treehugger Robot
e5313e42cc
Merge "Adding notification team members to notification directory" am: f290b00125 am: 1d7e8ae790 am: dbf857e2c7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6306474d5ac4eb50686da75fc85aa15418be03f
2021-02-24 05:54:51 +00:00
Treehugger Robot
d8137193ae
Merge "Grant BatteryStats OWNERS for FakeUid.java"
2021-02-24 05:34:05 +00:00
Treehugger Robot
dbf857e2c7
Merge "Adding notification team members to notification directory" am: f290b00125 am: 1d7e8ae790
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I32c192b2d4dfe390243a477b51ff807dced229fb
2021-02-24 05:08:28 +00:00
Tom Hsu
693e52688b
Merge "Only default APN type can make preference selectable." into rvc-qpr-dev am: f76a2ff641
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13672665
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia58c627514657f60dd2401cc7eaed1495d5747ca
2021-02-24 04:26:15 +00:00
Treehugger Robot
1d7e8ae790
Merge "Adding notification team members to notification directory" am: f290b00125
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba4fb1061bbc4036b3166f8ddc3d9836f10078a1
2021-02-24 04:26:10 +00:00
Tom Hsu
f76a2ff641
Merge "Only default APN type can make preference selectable." into rvc-qpr-dev
2021-02-24 03:59:11 +00:00
Adam Bookatz
042f06aadf
Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a598494 am: 8d618ac1f7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597161
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d2c2520b03586c375601f8987c53d9e25d68c6b
2021-02-24 03:30:08 +00:00
Treehugger Robot
f290b00125
Merge "Adding notification team members to notification directory"
2021-02-24 03:28:03 +00:00
Treehugger Robot
aff1b740fb
Merge "Owners updates" am: 395caa5fa6 am: c309ada683 am: 9aa1396e61
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597956
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia171da64408594c083538b047ee509dfe7d8fb20
2021-02-24 02:48:45 +00:00
Adam Bookatz
8d618ac1f7
Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a598494
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597161
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ida7f4763d4039cf8af53a37b7e5faf5d42dbae21
2021-02-24 02:40:25 +00:00
Adam Bookatz
96d1b53394
Grant BatteryStats OWNERS for FakeUid.java
...
FakeUid.java needs to be trivially updated whenever new abstract methods are added to BatterStats.Uid in frameworks since it extends it. (e.g. ag/13547202)
Change-Id: Ie24f14e17be49056ae07ac369a8cbd067aa7ae16
Test: N/A
2021-02-24 01:51:57 +00:00
Treehugger Robot
9aa1396e61
Merge "Owners updates" am: 395caa5fa6 am: c309ada683
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597956
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib105c249882f83e1789812031ac06fad66e7025b
2021-02-24 01:50:50 +00:00
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
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
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
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
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
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
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
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
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
Manish Singh
4b0a19f44e
Merge "Introduce controller for transcode notifications" into sc-dev
2021-02-22 17:39:43 +00:00
Ben Murdoch
a9f0903581
Merge "Correctly select peak refresh rate." into sc-dev
2021-02-22 12:43:08 +00:00
SongFerng Wang
63ed1b3f9f
Merge "EnabledNetworkModePreferenceController redo Init after sim activate" into sc-dev
2021-02-22 10:36:32 +00:00
SongFerngWang
f3b21931a5
EnabledNetworkModePreferenceController redo Init after sim activate
...
Failed to get RadioAccessFamily information from
TelephonyManager.getSupportedRadioAccessFamily due to SIM inactivated
Bug: 180360457
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Icfce6c319e9a84318c9496125718cd60dda6afbb
2021-02-22 16:42:51 +08:00
TreeHugger Robot
ba17639a13
Merge "Update battery saver switch string" into sc-dev
2021-02-22 08:07:38 +00:00
Chiachang Wang
0f40c023f6
Replace NetworkUtils methods
...
NetworkUtils is moved to connectivity mainline module which is
not accessible for module outside. getNetworkPart() method is
used by wifi lib and Settings but no usage inside the module,
so move the method to framework lib to share with wifi lib and
Settings.
Also, NetworkUtils.numericToInetAddress() method is also hidden
and deprecated. It should be replaced by
InetAddresses.parseNumericAddress().
Update the corresponding usage to refer to these methods.
Bug: 172183305
Test: atest SettingsRoboTests
Change-Id: I8240b1c74b53d5d66850d9a3ec7d5e5c11558e6a
Merged-In: I2fb674e0d7da0b11ba70177853fd6259bce372a3
2021-02-22 15:35:17 +08:00
Tom Hsu
a2b98fe18a
Merge "[Provider model] Show a string on internet picker when mobile data off" into sc-dev
2021-02-22 06:46:36 +00:00
TreeHugger Robot
d9fe64bec6
Merge "Remove enroll animation from touch sensor page" into sc-dev
2021-02-22 06:25:04 +00:00
TreeHugger Robot
7f171ee860
Merge "Update FingerprintEnrollEnrolling for UDFPS" into sc-dev
2021-02-22 06:24:52 +00:00
Wesley.CW Wang
2fb3390ce6
Update battery saver switch string
...
Bug: 180749420
Test: Test: make RunSettingsRoboTests -j40
Change-Id: Ibd65573a50a9c4f4ab2a055e7bdff6800cf1d873
2021-02-22 14:23:00 +08:00
Manish Singh
cbbe9da1ad
Introduce controller for transcode notifications
...
This is to provider users with control over whether to show transcoding
notifications or not.
By default we show the notifications.
The controller resides within the Media transcoding settings under
Developer Options.
BUG: 170973510
Test: manual. unit test added.
Change-Id: I7172f583ce4c1a53e5d5ccc07625f201852db43a
2021-02-21 18:31:06 +00:00
Xin Li
ad3fa60e26
Merge ab/7061308 into stage.
...
Bug: 180401296
Merged-In: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
Change-Id: I07d008e38827280c9e9c6b7fa31393309f9de8a3
2021-02-21 09:25:11 -08:00