PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,614 Commits 1 Branch 0 Tags
23234b25aa7aef3e6649536394246bd23e7da63c
Commit Graph

79614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Hsu
23234b25aa [automerger skipped] Merge "Only default APN type can make preference selectable." into rvc-qpr-dev am: f76a2ff641 am: 693e52688b -s ours am: b8ccb41c30 -s ours 
am skip reason: Change-Id Iae6943971c0cc6d31dc0e9d4dd97e850117adbfd with SHA-1 9bd774a0b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e58670523d4b886e9fd56abd9f7d31cc996f3e3
 2021-02-24 05:08:08 +00:00
Adam Bookatz
1e909882df [automerger skipped] Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a598494 am: 8d618ac1f7 am: 042f06aadf -s ours am: 750ed6a672 -s ours 
am skip reason: Change-Id I330d074c6e504493abf4cece51199ec5851b5d3b with SHA-1 9a90dc1e8e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ce8474d6b37f505320731cf15260edb8b4ee2de
 2021-02-24 05:08:03 +00:00
Tom Hsu
b8ccb41c30 [automerger skipped] Merge "Only default APN type can make preference selectable." into rvc-qpr-dev am: f76a2ff641 am: 693e52688b -s ours 
am skip reason: Change-Id Iae6943971c0cc6d31dc0e9d4dd97e850117adbfd with SHA-1 9bd774a0b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33c22d67cc1e7c2716c5ac9172225d240a61e97b
 2021-02-24 04:30:45 +00:00
Adam Bookatz
750ed6a672 [automerger skipped] Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a598494 am: 8d618ac1f7 am: 042f06aadf -s ours 
am skip reason: Change-Id I330d074c6e504493abf4cece51199ec5851b5d3b with SHA-1 9a90dc1e8e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7aa1b661119b6f224ffbd935a1b5a3d95a52a5c
 2021-02-24 04:30:23 +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
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
e4c1f3899f 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: I219f9b41b5286369815653f8b7e87e04e37c4178
 2021-02-24 03:04:46 +00:00
Chiachang Wang
4c93df3055 [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: I3c7be91e39b3ef4b3da709247b33e6f5a8a6dc3b
 2021-02-24 02:59:59 +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
TreeHugger Robot
099560ae98 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: I428c6a9721e332f6519565c9672b00cd327d9b7c
 2021-02-24 02:40:33 +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
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
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
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
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
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