Commit Graph

48976 Commits

Author SHA1 Message Date
TreeHugger Robot
8c1cfbdf91 Merge "Remove SettingsRobolectricTestRunner" 2018-12-13 23:08:43 +00:00
Xin Li
8920ec68f9 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 889a8a3757 -s ours am: a817ea5e80 -s ours
am: e92deab316  -s ours

Change-Id: I596c427de3b27a6b3f323117fbc037a0c000f417
2018-12-13 14:24:53 -08:00
Xin Li
3cc0395e28 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 419086d8b3 -s ours am: 7768155274 -s ours
am: e21ca76caf  -s ours

Change-Id: I4436b32c366bb62b2a2099d6f817e02cfa8c5927
2018-12-13 13:58:56 -08:00
Xin Li
e92deab316 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 889a8a3757 -s ours
am: a817ea5e80  -s ours

Change-Id: Ie235529d9065bdc9f258f91ba8206cda6d96379e
2018-12-13 13:13:47 -08:00
Xin Li
a817ea5e80 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
am: 889a8a3757  -s ours

Change-Id: Ide998fc70c7beb72b1bcf878783a5429268d1aeb
2018-12-13 13:09:45 -08:00
Xin Li
e21ca76caf [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 419086d8b3 -s ours
am: 7768155274  -s ours

Change-Id: I91475b01f6a1fa9f64f384ee6351e237c3e79c85
2018-12-13 12:19:49 -08:00
Jack Yu
50972ed89e Moved data settings to phone
Since there are multiple DcTrackers, but we only have
one set of data settings. So we need to move them from
DcTracker to Phone.

Test: Telephony sanity tests + unit tests
Bug: 73659459
Change-Id: If11a6eff057a18b4aa97addbb348537bd3194e1a
2018-12-13 11:51:20 -08:00
Vishwath Mohan
b6dad935ec Add settings to control Extended Access mode.
This CL adds settings (and two toggle controls) that help configure
how trust (from Trust Agents) should be interpreted by the platform,
allowing them to function in a purely extend unlock mode (where they
can extend how long an already unlocked device stays unlocked, but
cannot unlock a locked device).

These are temporary settings to help with dogfooding the new behavior,
and will eventually be removed. b/120871688 below is the tracking bug
to remove them.

Bug: 111435975
Bug: 120871688
Test: Tested with SmartLock modalities to confirm behavior in both
legacy and extend unlock modes is WAI.
Change-Id: If25098520ba98e82c98cc51fb226d8f2ce1aba80
2018-12-13 19:44:33 +00:00
Xin Li
7768155274 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
am: 419086d8b3  -s ours

Change-Id: I620bd09f7331acdb7a6a8377cb02d4ccea4293f8
2018-12-13 11:24:06 -08:00
Fan Zhang
abbc619601 Remove SettingsRobolectricTestRunner
Test: rerun robotests
Change-Id: I7054d8d5cfc4756beb8d3032bc92361534229494
2018-12-13 11:20:40 -08:00
Anton Hansson
16322a0271 Make the Settings permission a required module
This will include the Settings permission file whenever
the Settings app is installed.

Bug: 110072687
Test: make
Change-Id: Ia2548355282498bceeffddb564de32a6cb857c66
2018-12-13 11:01:16 +00:00
TreeHugger Robot
887fa5c646 Merge "Use binary resource support in robolectric" 2018-12-13 07:44:19 +00:00
TreeHugger Robot
a56b5926a9 Merge "Fix ANR in SliceRelayReceiver" 2018-12-13 06:20:19 +00:00
Treehugger Robot
889a8a3757 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" 2018-12-13 05:45:20 +00:00
Fan Zhang
e824c7e005 Merge changes I6e73bcf9,I257ba108
* changes:
  Add a timeout waiting for contextual card loader.
  Set setting back to default when turning off dev option
2018-12-13 04:03:28 +00:00
TreeHugger Robot
5f10245da9 Merge "Add vertical and horizontal dividers for large cards of homepage" 2018-12-13 03:55:34 +00:00
James Lemieux
f1dade40d2 Use binary resource support in robolectric
The resources available to tests are now exactly the merged resources
located in the APK under test.

Bug: 74359828
Test: make -j56 RunSettingsRoboTests
Change-Id: I050db81a92decefea23314b5ec7a62f77ff4bb2b
2018-12-12 19:53:49 -08:00
Jason Chiu
c0c5511862 Add vertical and horizontal dividers for large cards of homepage
- Add a new field in ContextualCard to store whether this card is a large one
- Set dividers for large cards in renderer

Fixes: 119528161
Fixes: 119641839
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage
Change-Id: I5cb95214789f44ccfd8d9ce2177ca2b84835b7a4
2018-12-13 03:40:05 +00:00
Colin Cross
1f5fab1480 Merge "Revert "Change LayoutPreference resource path in robo test"" 2018-12-13 03:16:05 +00:00
Colin Cross
75ac728e0e Revert "Change LayoutPreference resource path in robo test"
This reverts commit ff8fca7d9e.

Reason for revert: broke build when combined with ag/5781147
Bug: 120706174

Change-Id: Id543bc3cb0b4979144e92c400e57988009f4c407
2018-12-13 03:15:08 +00:00
Raff Tsai
86a2afe798 Fix ANR in SliceRelayReceiver
The same broadcast are handled in SliceRelayReceiver and WifiScanWorker.
We will only use WifiScanWorker to handle wifi broadcast.

Change-Id: I32c2fcc699ae240f12bd1049ba33e1792ae123b0
Fixes: 120284615
Test: manual
2018-12-13 10:34:45 +08:00
TreeHugger Robot
906d731b11 Merge "Change LayoutPreference resource path in robo test" 2018-12-13 02:11:59 +00:00
TreeHugger Robot
91cc417bb0 Merge "Do not return null in getSlice()" 2018-12-13 02:11:52 +00:00
Pasty Chang
57baac2df5 Merge "Change to use setupcompat and setupdesign for suw pages" 2018-12-13 01:48:58 +00:00
Ben Lin
5fe372a039 Exclue Scanning Settings for searchable in ARC.
Scanning settings is actually done outside of Android, in the host OS.

Bug: 120222705
Test: RunSettingsRoboTests RunArcSettingsRoboTests
Change-Id: I92435541a671c43d3584f1f223b8b744e6182aa9
2018-12-12 16:55:08 -08:00
Johnson Lu
d6a40032c1 Merge "Implement receiver flow of WiFi sharing feature" 2018-12-13 00:54:46 +00:00
Fan Zhang
ad12b76a98 Add a timeout waiting for contextual card loader.
- Intially setting it to 1 second.
- Also changed card appear animation from drop in to fade in. It looks
  less janky if we don't animate any size change.
- And some random code cleanup

Change-Id: I6e73bcf98fd9aa1d76ae002b94ab5b068dfecf1e
Fixes: 120916829
Test: robotests
2018-12-12 16:28:24 -08:00
Fan Zhang
07933cb967 Set setting back to default when turning off dev option
When turning off developer options, mobile data always on setting should
be set back to default, which is ON not OFF.

Change-Id: I257ba108976b05162fa3cea6e48f3490e9c64f80
Fixes: 119719605
Test: robotests
2018-12-12 16:28:24 -08:00
Wei Wang
4c3a0d7c2a Make location history package not disableable.
Bug:119226131

Test: Unit test, also tested manually on device

Change-Id: Ib72fdd8b5195b67ef9d79a8a6dbb91acc54dbbbf
2018-12-12 16:21:39 -08:00
TreeHugger Robot
6718986bb9 Merge "Add temporary link to PermissionController for new default apps UI." 2018-12-12 23:49:30 +00:00
TreeHugger Robot
0178e1f277 Merge "Update settings together with framework changes" 2018-12-12 20:07:39 +00:00
Hai Zhang
2101151180 Add temporary link to PermissionController for new default apps UI.
This change adds a temporary link in the default apps settings to
allow launching the new default apps UI in PermissionController during
the process we migrate default apps to use roles.

Bug: 110557011
Test: manually tested the UI
Change-Id: I0ac340acd5a077c74b48b28c97f517adb2084a36
2018-12-12 10:47:17 -08:00
TreeHugger Robot
eac550c0ca Merge "Update background color of Contextual Home Page" 2018-12-12 18:35:29 +00:00
Raff Tsai
c886544a55 Do not return null in getSlice()
- It will result in a empty SliceView. Because we can use
slice.hasHint(HINT_ERROR) to check if we should show the slice,
always return a valid slice object.
- Set tintcolor -1 therefore battery icon will not have tint

Bug: 120221527
Test: manual
Change-Id: Idfc97f90c75515b079e1faed802c9b9047bfdeb4
2018-12-13 00:39:34 +08:00
TreeHugger Robot
db363a8026 Merge "Implement Wi-Fi DPP UI." 2018-12-12 10:05:45 +00:00
Yanting Yang
7eb5752670 Update background color of Contextual Home Page
Change-Id: Ifdd708c0ffaaa7bd50e945c33769cb093a40295f
Fixes: 120684259
Test: visual, robotest
2018-12-12 17:47:39 +08:00
Kevin Chyn
6bafa1d830 Update settings together with framework changes
Bug: 120578823

Test: builds, behaves as expected
Change-Id: Id7fd84069c725cde3ed2c38060ab6a636066fcfa
2018-12-11 19:50:01 -08:00
Pasty Chang
c1f8600d9f Change to use setupcompat and setupdesign for suw pages
1. remove the dependence of setupwizardlib.
2. add to use setupcompat and setupdesign.
3. modify new footer button in following up cl.

Bug: 120805516
Bug: 120872944
Test: RunSettingsRoboTests
Change-Id: I463dd35b799d4250b2aabce0cb0b8102cf9dd7d6
2018-12-12 03:16:29 +00:00
cosmohsieh
18e3692ea3 Remove bug id for WiFi MAC randomization since feature is ready.
Bug: 117957974
Test: RunSettingsRoboTests
Change-Id: I36955d302d9c365e7985a53c6a2a89026f6ebb34
2018-12-12 02:16:47 +00:00
Arc Wang
4ab0d168e2 Implement Wi-Fi DPP UI.
Add WifiDppEnrolleeActivity
  Remove bottom buttons of WifiDppQrCodeScannerFragment
  Add ActionBar in WifiDppQrCodeScannerFragment &
      WifiDppQrCodeGeneratorFragment

Bug: 118797380
Bug: 118794858
Test: atest WifiDppConfiguratorActivityTest
      atest WifiDppQrCodeScannerFragmentTest
      atest WifiDppQrCodeGeneratorFragmentTest
      atest atest RunSettingsRoboTests

Change-Id: I1d464dc9a8d54a896b8e0c9185a74bed7b193b60
2018-12-12 10:07:20 +08:00
Xin Li
2602e42b65 [automerger skipped] Merge "DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master am: 2d744bd9e1 -s ours
am: 2c2f179630  -s ours

Change-Id: I1bba0ad51442e03281b6b668c6a16ced39cc62a8
2018-12-11 16:10:42 -08:00
Xin Li
2c2f179630 [automerger skipped] Merge "DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
am: 2d744bd9e1  -s ours

Change-Id: Ia5bc1d228449c6f78d54f25c392b3ea33c80ddef
2018-12-11 15:54:17 -08:00
Xin Li
14a0b78083 [automerger skipped] DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: 5134815af5 -s ours
am: dfd5b86302  -s ours

Change-Id: I620010be975c04bf76e9eee8db22069e34d8237e
2018-12-11 15:38:49 -08:00
Salvador Martinez
6974be492b Merge "Create shell UI for smart battery saver" 2018-12-11 23:24:53 +00:00
Xin Li
419086d8b3 DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Bug: 120502534
Change-Id: I63bedf30fa0a4629cfab1dbe94359b4d36cf9ac1
2018-12-11 15:24:05 -08:00
TreeHugger Robot
45ed311e26 Merge "Add edit and delete buttons to zen rules" 2018-12-11 23:11:56 +00:00
Xin Li
dfd5b86302 [automerger skipped] DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
am: 5134815af5  -s ours

Change-Id: I2bb19a2cb832111ee29ef3762c3b13808dde3b11
2018-12-11 15:07:53 -08:00
TreeHugger Robot
2d744bd9e1 Merge "DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master 2018-12-11 21:49:26 +00:00
Salvador Martinez
108faaf1ce Create shell UI for smart battery saver
This CL creates the new screen WITHOUT any of the behaviors
(changing the global settings/calling power manager apis) and
hooks it up to the preference in BatterySaverSettings for
navigation. The logic for the preference in BatterySaver Settings
is also added so that it shows the correct summary when the
schedule settings are modified. Additionally, a small tweak is
made to the radio preference widget to make it possible to hide
the appendix view. It didn't seem to do anything except get in
the way and potentially ruin your day, much like its biological
counterpart.

Test: Overriding power mode via adb, robotests
Bug: 111450127
Change-Id: Ic681aaf565ce1caf7d00d314e14ae6c4779fe8f6
2018-12-11 11:20:02 -08:00
Beverly
48903ccefe Add edit and delete buttons to zen rules
Test: atest ZenModeScheduleRuleSettingsTest ZenModeEventRuleSettingsTest
Test: manual
Bug: 111475013
Fixes: 120787343
Fixes: 120758763
Change-Id: If81ce2972e6887fb2a85d4b7262e81b26162e19c
2018-12-11 13:56:05 -05:00