PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,027 Commits 1 Branch 0 Tags
c271a656a719f27dd5c0670c22a000b2edab7b3f
Commit Graph

72027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Meng Wang
3b19347431 Merge "Use string "Carrier settings version"" am: 2161d17f32 am: 0b31d30218 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03542ee476ebff7bfae2a8f54894f00f69578744
 2021-02-25 00:44:42 +00:00
Meng Wang
0b31d30218 Merge "Use string "Carrier settings version"" am: 2161d17f32 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cbb0cd3d4c4726587082ecc4cbbfa2957e60467
 2021-02-25 00:10:09 +00:00
Meng Wang
2161d17f32 Merge "Use string "Carrier settings version"" 2021-02-24 23:17:20 +00:00
Meng Wang
3f9db799e5 Use string "Carrier settings version" 
.. instead of "Settings version".

Bug: 160843335
Change-Id: Ie98b9f2c62627c1e34dfa807357625b483577305
Test: make
 2021-02-24 21:15:08 +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
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
paulhu
c11ac84929 Replace ConnectivityManager hidden symbols on Settings 
Connectivity is becoming a mainline module in S, so
ConnectivityManager hidden symbols can not be used for outside
components. Besides, most Tethering relevant methods or variables
on CM are migrated to TetheringManager. So replace all these
methods or variables from ConnectivityManager to TetheringManager
on Settings.

Bug: 180693313
Test: make RunSettingsRoboTests ROBOTEST_FILTER=<Modified Test>
Change-Id: Iba4b121a4ddf3f04252aa0355e0e6494a593682a
Merged-In: Iba4b121a4ddf3f04252aa0355e0e6494a593682a
 2021-02-24 11:45:02 +08: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
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
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
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
Chiachang Wang
78b260f5fe Merge "Replace subnet mask calculation to Inet4AddressUtils" 2021-02-23 07:28:31 +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
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
3dd1c29aee Merge "Replace NetworkUtils methods" 2021-02-23 00:58:59 +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
Xin Li
ad3fa60e26 Merge ab/7061308 into stage. 
Bug: 180401296
Merged-In: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
Change-Id: I07d008e38827280c9e9c6b7fa31393309f9de8a3
 2021-02-21 09:25:11 -08:00
Weng Su
880e2ab494 Owners updates 
- Add wengsu to network path for provider model feature implementation

- Add wifi/OWNERS to tests/unit/src/com/android/settings/wifi/OWNERS

Bug: 180778022
Test: N/A, just owners update
Change-Id: I9255fb4980dbbe163850be2459528a3380c15d76
 2021-02-20 12:58:25 +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
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
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
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
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
f91d9c40f2 Add OWNERS 
Bug: 179666288
Test: Build pass
Change-Id: I6e42f45083ee6dac9f0aeed4be71820107f4fd58
 2021-02-19 02:33:26 +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
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