PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,588 Commits 1 Branch 0 Tags
18d056c2c140ed29e4989a88d5044fb61c10aa03
Commit Graph

79588 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Ben Murdoch
6309c48439 Merge "Correctly select peak refresh rate." into sc-dev am: a9f0903581 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13630151

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6791071c8934ee1e0a819f777907bd1b26a2f9c
 2021-02-22 13:06:00 +00:00
Ben Murdoch
a9f0903581 Merge "Correctly select peak refresh rate." into sc-dev 2021-02-22 12:43:08 +00:00
SongFerng Wang
81c417ea37 Merge "EnabledNetworkModePreferenceController redo Init after sim activate" into sc-dev am: 63ed1b3f9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13627531

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7707094ae60024194f2de7f177d48394535bbcd
 2021-02-22 11:25:19 +00:00
SongFerng Wang
63ed1b3f9f Merge "EnabledNetworkModePreferenceController redo Init after sim activate" into sc-dev 2021-02-22 10:36:32 +00:00
Yi Jiang
ef851e84ed Promotes screen timeout setting. 
This change puts the screen timeout setting before the 'advanced' tab in
Settings->Display.

Test: manual
Bug: 180759324
Change-Id: I32081fa289be5b9c2bb1cc5089161ad70386ed39
 2021-02-22 09:03:56 +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
Thiebaud Weksteen
b8754ba9df Merge "Add onPreferenceChange_update tests" into sc-dev am: 10ebd252e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13580622

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1adf75da4f35e8da621853d5dbceeec9fba5e5a
 2021-02-22 08:33:31 +00:00
TreeHugger Robot
924a74b29e Merge "Update battery saver switch string" into sc-dev am: ba17639a13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13639632

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8139d973d3d754a63226d41389fa1d80427e9ff8
 2021-02-22 08:33:13 +00:00
Thiebaud Weksteen
10ebd252e0 Merge "Add onPreferenceChange_update tests" into sc-dev 2021-02-22 08:10:10 +00: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
Tsung-Mao Fang
8e25dcaece Fix broken test 
- Remove a test which is a non-public method.
- Re-implemented the test.

Fix: 180874869
Test: Run robo test
Change-Id: Ic9716278653c874a8f7d98b56b7e32f19d157382
 2021-02-22 07:34:30 +00:00
Tom Hsu
221fb4a7fc Merge "[Provider model] Show a string on internet picker when mobile data off" into sc-dev am: a2b98fe18a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13627530

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9f96ad4906ecc9573b6cb9aa3bf5118c4787493
 2021-02-22 06:57:22 +00:00