Tom Hsu
3bc9bcdae2
Merge "[Provider Model] Fix preference summary not update." into sc-dev am: 1db2d1a25b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769541
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I724225de0d877cf017b289b7a0b9198771b20ba9
2021-03-05 04:53:46 +00:00
TreeHugger Robot
7e7779a422
Merge "[Provider Model] Ethernet default network with APM enabled on Panel" into sc-dev am: 74d540f8f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13755450
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I85baaf7368b8f34046e606a451528fd3d3c416df
2021-03-05 04:25:01 +00:00
Tom Hsu
1db2d1a25b
Merge "[Provider Model] Fix preference summary not update." into sc-dev
2021-03-05 03:25:59 +00:00
Jeremy Goldman
576009adeb
Merge "StorageProfileFragmentTest converted to JUnit"
2021-03-05 03:24:17 +00:00
TreeHugger Robot
74d540f8f0
Merge "[Provider Model] Ethernet default network with APM enabled on Panel" into sc-dev
2021-03-04 22:46:37 +00:00
tom hsu
edaeb41ff7
[Provider Model] Fix preference summary not update.
...
- When activity enter onPause, the status will not update, then
sub id of TelephonyManager keep same value after activity go back.
- Solution: Everytime update the UI, and always get new
TelephonyManager with the latest sub id.
Bug: 181196545
Test: atest passed.
Test: Manual test passed.
Change-Id: I1d65bbc06af66b97b6c85f40bed394da03213d06
2021-03-04 21:26:57 +08:00
Weng Su
698b4b3ca0
[Provider Model] Ethernet default network with APM enabled on Panel
...
- Move the connected Wi-Fi network into Wi-Fi list
- Screenshot:
https://screenshot.googleplex.com/ALgpHTy8RWUYjSk
Bug: 178926547
Bug: 179106406
Test: manual test
atest -c ProviderModelSliceTest
Change-Id: Idd0e0ab52d6fc88633d5b2eddabb00036e077c88
2021-03-04 18:27:54 +08:00
Jeremy Goldman
859fc2bc15
Merge "HardwareRevisionPreferenceControllerTest converted to JUnit."
2021-03-04 01:22:49 +00:00
Jeremy Goldman
7f98211d08
Merge "DeviceModelPreferenceControllerTest converted to JUnit."
2021-03-04 01:22:33 +00:00
Sally Yuen
b3d9280c3f
Merge "Call into ColorDisplayManager for RBC slider range" into sc-dev am: 4d5a03da7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13688354
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8322e261f22e96fd9e05700f6aff0d90a94628e3
2021-03-02 18:39:46 +00:00
Sally Yuen
4d5a03da7e
Merge "Call into ColorDisplayManager for RBC slider range" into sc-dev
2021-03-02 17:38:30 +00:00
TreeHugger Robot
4a98bad643
Merge "[Provider Model] Show connected networks in APM/APM networks" into sc-dev am: 9531fb8ffb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13664265
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I327a90bda998ef4e25974bbf1e3bbc2a0348e1ff
2021-03-02 02:22:11 +00:00
TreeHugger Robot
9531fb8ffb
Merge "[Provider Model] Show connected networks in APM/APM networks" into sc-dev
2021-03-02 01:53:04 +00:00
Weng Su
f1489b51a3
[Provider Model] Show connected networks in APM/APM networks
...
- Separate APM and APM network types from other Internet types because
they can coexist at the same time.
- Show no internet icon in airplane-mode networks.
- Show connected non-carrier(Wi-Fi) network in airplane-mode networks.
- Show connected Ethernet network when airplane mode on.
- Screenshot:
https://screenshot.googleplex.com/cr3eWNLMEuJ8zvP
https://screenshot.googleplex.com/6DiMqKBBnBoxxhN
Bug: 180778141
Bug: 180778839
Bug: 179106406
Test: manual test
atest -c ConnectedEthernetNetworkControllerTest \
InternetConnectivityPanelTest \
InternetPreferenceControllerTest \
InternetUpdaterTest
Change-Id: I861d5ce879facbb61dfdc5b7be943662d55bdcca
2021-03-02 02:59:11 +08:00
Julia Reynolds
fff6dde818
Merge "Updates to NLS notif type filtering" into sc-dev am: 6698d3b2c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13691340
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id9c1ac17f70d6b1fa4b9185cd7947dcaff8f48e5
2021-02-27 15:54:14 +00:00
Julia Reynolds
dc79f1ba99
Updates to NLS notif type filtering
...
- Allow an app to tell us they will never bridge a notification
type. We will then not let a user select that type
- Checkboxes everywhere.
Test: Settings unit
Bug: 181125165
Bug: 181124973
Change-Id: I73939d3d0e99016456e009b2f104cdded98411c6
2021-02-26 19:27:25 +00:00
Bob Badour
82798df54a
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings am: a73a67240c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13701598
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iada5fa90a369fc0476be9a58facf465778622f20
2021-02-26 02:45:14 +00:00
Bob Badour
a73a67240c
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings
...
Added SPDX-license-identifier-Apache-2.0 to:
Android.bp
protos/Android.bp
tests/anomaly-tester/Android.bp
tests/componenttests/Android.bp
tests/legacy_unit/InstrumentedEntitlementApp/Android.bp
tests/perftests/Android.bp
tests/robotests/Android.bp
tests/uitests/Android.bp
tests/unit/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: I58a85aced69923fa9a8e5a2b89ecfdd33de5e05c
2021-02-25 15:05:14 -08:00
Bob Badour
18e9723489
Revert "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings"
...
This reverts commit 0e73d05c74 .
Change-Id: I627be6c5355eda9602b1cb201806fce4548fc951
2021-02-25 11:52:32 -08:00
sallyyuen
ade7bd8627
Call into ColorDisplayManager for RBC slider range
...
Test: atest ReduceBrightColorsIntensityPreferenceControllerTest
Bug: b/179805222
Change-Id: I0927f41fad27e6b9b54c374e2c6a7cc6e0c5240d
2021-02-25 10:34:16 -08:00
Jeremy Goldman
5a36305aae
StorageProfileFragmentTest converted to JUnit
...
Looper and UIThreadTest added.
Test: atest -c StorageProfileFragmentTest
Change-Id: Ib561a0e87a0b5034f7692f2567c8617e7f5f763e
2021-02-25 15:20:12 +08:00
Jeremy Goldman
47e1c78343
Merge "PrivateVolumeOptionMenuControllerTest converted to JUnit"
2021-02-25 05:43:56 +00:00
Jeremy Goldman
3098ea1274
Merge "BrandedAccountPreferenceControllerTest converted to JUnit"
2021-02-25 05:43:29 +00:00
Jeremy Goldman
9ec80bb8b0
Merge "TopLevelStoragePreferenceControllerTest converted to JUnit"
2021-02-25 01:31:20 +00:00
Suprabh Shukla
9f566fe469
Merge "Adding alarms and reminders activity" into sc-dev am: a78849982d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13633051
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic41874282654b015c7fa450af9b3066b19c72e1a
2021-02-24 21:18:15 +00:00
Jeremy Goldman
899eb7282d
TopLevelStoragePreferenceControllerTest converted to JUnit
...
Helper function composed to return thread future, to guarantee
concurrent function finishes before test condition is checked.
Additionally a @VisibleForTesting helper function is used rather than
robolectric reflection helpers to set a class variable.
Test: atest -c TopLevelStoragePreferenceControllerTest
Change-Id: Ia22ebac4baec60f72b8516e9e79998cd788266ab
2021-02-24 16:24:19 +08:00
Treehugger Robot
8fc4828ad2
Merge "Adding notification team members to notification directory" am: f290b00125 am: 1d7e8ae790 am: dbf857e2c7 am: e5313e42cc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I296d9933a284ce1ccbd1ec01c9bd4f641d0b825f
2021-02-24 06:58:11 +00:00
Suprabh Shukla
c8b9240535
Adding alarms and reminders activity
...
Adding a settings screen to control the permission SCHEDULE_EXACT_ALARM.
Apps can start this by starting a newly introduced API intent
REQUEST_SCHEDULE_EXACT_ALARM.
Test: make -j RunSettingsRoboTests
Manually by UI inspection:
Settings -> Apps -> Special App access -> Alarms and Reminders
or by running:
adb shell am start -a android.settings.REQUEST_SCHEDULE_EXACT_ALARM
Bug: 171306433
Bug: 171305516
Change-Id: I1293d38fc50a22b2af46f80ab24f676ed632f964
2021-02-23 22:32:24 -08:00
Jeremy Goldman
d2a5331711
PrivateVolumeOptionMenuControllerTest converted to JUnit
...
ArgumentCaptor used to verify which activity is started by the context.
Additionally, spy of application runtime context used instead of a
robolectric shadowActivity
Test: atest -c PrivateVolumeOptionMenuControllerTest
Change-Id: I5afd83cc09d57150661b22156a2fb06e1f09ea0b
2021-02-24 13:59:13 +08: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
Jeremy Goldman
b277923e56
BrandedAccountPreferenceControllerTest converted to JUnit
...
Resource determining controller availability is mocked, rather than
using robolectric device config.
Diff: https://diff.googleplex.com/#key=JywCGq1rz3Pb
Test: atest -c BrandedAccountPreferenceControllerTest
Change-Id: I14e6db63af29479cb663895f9d9259bff0df43b7
2021-02-24 05:41:03 +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
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
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
Jeremy Goldman
eb86ccbf6b
Merge "BuildNumberPreferenceControllerTest converted to JUnit"
2021-02-24 01:44:55 +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
Julia Reynolds
f2a444328c
Adding notification team members to notification directory
...
Change-Id: Ie51b4b4ac69843b3a68957e03462d1b226abbdc0
2021-02-23 18:54:59 +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
Jeremy Goldman
b8f05956ed
HardwareRevisionPreferenceControllerTest converted to JUnit.
...
Diff: https://diff.googleplex.com/#key=Snb7bwFLO81L
Test: atest -c HardwareRevisionPreferenceControllerTest
Change-Id: I85e8fb02f5ac213f04912026e74dfaae92a2decd
2021-02-23 08:42:43 +00:00
Jeremy Goldman
e8dba387f6
Merge "HardwareInfoPreferenceControllerTest migrated to JUnit."
2021-02-23 07:11:25 +00:00
Jeremy Goldman
a8bf939d41
DeviceModelPreferenceControllerTest converted to JUnit.
...
Test: atest -c DeviceModelPreferenceControllerTest
Change-Id: Ibdf3a86fb7f77a40844b62980e4e3f1f7e9a5bd8
2021-02-23 15:00:08 +08: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
Manish Singh
a80c9c396a
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: I59140ece443a8d0f12629d2d2a4b5f57aa2be5da
2021-02-22 18:01:36 +00:00
Manish Singh
4b0a19f44e
Merge "Introduce controller for transcode notifications" into sc-dev
2021-02-22 17:39:43 +00:00
Thiebaud Weksteen
5227a76ef3
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: Iadc4f55aef42ade37dba915b41bc2a332ecadd64
2021-02-22 08:33:33 +00:00
Thiebaud Weksteen
10ebd252e0
Merge "Add onPreferenceChange_update tests" into sc-dev
2021-02-22 08:10:10 +00:00
Tom Hsu
543d46be36
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: Ieae780dde69ab48db48042bc0e241f8802d570cb
2021-02-22 06:57:23 +00: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
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