PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,747 Commits 1 Branch 0 Tags
67c21f6bea39d1a5541b08a0fb06e468ceeb1ac6
Commit Graph

79747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
69fcca2971 Merge "Owners updates" am: 395caa5fa6 am: c309ada683 am: 9aa1396e61 am: aff1b740fb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597956

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f9eef724459f3b4bc876e0f407041a7cbfc60fc
 2021-02-24 03:06:01 +00:00
Chiachang Wang
6972ae41dc [automerger skipped] Merge "Replace subnet mask calculation to Inet4AddressUtils" am: 78b260f5fe am: 12eadd2133 am: b7f1c84f5b -s ours am: 9eda4e7f1e -s ours 
am skip reason: Change-Id I38d7d09be612fa4788cf4052bf304d17f0ae79f4 with SHA-1 17a8eacab4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2309d7e7564d0925df4ff4b4ad0a6f8ded31ff5d
 2021-02-24 03:03:20 +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
Chiachang Wang
9eda4e7f1e [automerger skipped] Merge "Replace subnet mask calculation to Inet4AddressUtils" am: 78b260f5fe am: 12eadd2133 am: b7f1c84f5b -s ours 
am skip reason: Change-Id I38d7d09be612fa4788cf4052bf304d17f0ae79f4 with SHA-1 17a8eacab4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2f668632111e434b3c549d619782f571f22a78e
 2021-02-24 02:47:54 +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
TreeHugger Robot
df2fb91fd1 Merge "Move LocationServicePreference to Location > LocationServices" into sc-dev am: 6731f0eb7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13605909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28967dd9c7981c60d21c30a08cc7c8d8ef03af3d
 2021-02-24 02:40:07 +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
Jeremy Goldman
eb86ccbf6b Merge "BuildNumberPreferenceControllerTest converted to JUnit" 2021-02-24 01:44:55 +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
a8b2d9457b [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: I3ef893c8afde0b8c77e6166027a94ed6275cf5ee
 2021-02-24 01:24:51 +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
a609745a84 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: I3dfaec53f360789f8e4f922f3917848770be9e87
 2021-02-23 18:00:19 +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
363a2513a8 [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: I3073abd0aae1613d739513584bcca5c0458d54c8
 2021-02-23 11:30:43 +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
Jeremy Goldman
22241eb25f BuildNumberPreferenceControllerTest converted to JUnit 
UserManager spy used instead of ShadowUserManager.
ArgumentCaptor used for ClipData rather than getting the primary clip.
Test: atest -c BuildNumberPreferenceControllerTest

Change-Id: Idd9e93371f1abda7bf9169ee86116fb7efb9ca09
 2021-02-23 17:15:24 +08: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
Jeremy Goldman
e8dba387f6 Merge "HardwareInfoPreferenceControllerTest migrated to JUnit." 2021-02-23 07:11:25 +00:00
Mill Chen
52ebeb709d 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: I17bada041be71215175d49abc518e89844ce3b28
 2021-02-23 07:06:07 +00:00
Wesley.CW Wang
3a678ef6ab 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: I3ef3a47aa11b69eae928a01ed386a3991c81d160
 2021-02-23 07:04:05 +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
Jeremy Goldman
6bccd36399 HardwareInfoPreferenceControllerTest migrated to JUnit. 
ResourcesUtils used to get boolean resource id.

Test: atest -c HardwareInfoPreferenceControllerTest
Change-Id: I55aad63d8fbab5a70dafd49f2f79965dce5049b6
 2021-02-23 14:00:23 +08:00
Chiachang Wang
dad8f09b3b 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: Ia3b5e175314931e052466c88abc79d73966dea1f
 2021-02-23 05:57:50 +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
f304f02e14 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: I2bf58d8ab41ebcbb1be67a4241be260bfb0d8597
 2021-02-23 04:59:12 +00:00
Colin Cross
93c802e4c4 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: Icae5b7bc16c04c87bdd8288773ace16df3b3e904
 2021-02-23 04:58:49 +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
548e03d072 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: I9608ec27e95f7866bbef8a0facc76d0f405e7a01
 2021-02-23 04:32:57 +00:00
Colin Cross
c43e00d1d0 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: Id60f70d7f132eda83d5670387aed6cb80b338588
 2021-02-23 04:32:19 +00:00
Colin Cross
c3e5978b21 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: I98839538ecfd71dda6532a64fb92ece8d855b2fe
 2021-02-23 04:32:17 +00:00