Paul Duffin
c1542f1fd4
Refactor code incompatible with Mockito 2.7.13
...
Bug: 32912773
Test: make checkbuild
Change-Id: Idcd89438aa05ed2d010934cc6613763d4cfb9885
2017-03-10 14:59:09 +00:00
Gustav Sennton
75f0b1b2e4
WebView implementation Dev setting: Show the version number after name
...
Show the package version of each WebView implementation after their
package name in the WebView Implementation Dev Setting. Showing a
package version is useful for debugging purposes.
Bug: 35621558
Test: run make RunSettingsRoboTests
Test: Ensure package version is shown in titles of items in WebView
Implementation Dev Setting.
Change-Id: If195dd87aebeac1783600b7c9f376ff8e791c3be
2017-03-10 14:40:37 +00:00
TreeHugger Robot
e11cb90ed2
Merge "Replaced auto-fill by autofill to keep it consistent with API style."
2017-03-10 07:05:36 +00:00
TreeHugger Robot
a94c818330
Merge "Fix misc style issue in "Open by default" screen."
2017-03-10 03:40:40 +00:00
Doris Ling
133b096288
Add logging to Bluetooth settings.
...
- Add logging when users selects the listed devices to connect or
disconnect, and when connection error is shown
- Update the event for the top level bluetooth master switch toggle to
have its own event.
Change-Id: I58f21256fdd07fad9d733ff987ff38df1148f4f8
Fix: 35065258
Test: make RunSettingsRoboTests
2017-03-09 18:14:30 -08:00
Fan Zhang
1c1d11002d
Fix misc style issue in "Open by default" screen.
...
Fix: 35960603
Test: visual
Change-Id: I6d3f471bb31e8c945d4d3346ad9512cda095ed64
2017-03-09 18:10:59 -08:00
Fan Zhang
3515cc8217
Refactor sound setting -> work profile initialization logic.
...
- Some formatting change
- Merge work profile sound settings into main sound setting xml file, and
use existing WorkCategory to host it. This category automatically hides
everything within if user is not using work profile.
- Remove logic for manually populating work profile sound setting into
the UI, thus removing the animation glitch when expanding advanced
button.
Change-Id: I90459e5cd1d3d20a97ea3629e143ebf13dbd0f76
Fix: 35959624
Test: make RunSettingsRoboTests
2017-03-09 17:49:54 -08:00
Fan Zhang
1f5fdab61e
Misc fixes
...
- Remove tiny icon in bluetooth subheader
- Turn new search on
Fix: 35917435
Test: make RunSettingsRoboTests
Change-Id: I97a02319108a46a0c3df2295ddec49d47f13b597
2017-03-09 14:06:43 -08:00
Dmitry Dementyev
5e2545c3e6
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258
am: 3a5e567ab9
am: b7e2545217
am: def3eddb43
am: 3964c51bf2
-s ours am: f1fb452863
am: 2569925151
am: efb9f74486
am: d5f3ae5cac
am: 0fb3d55e3a
...
am: dd48f602bb
Change-Id: I69d192ea59bd5c2b79abd513e88aecc78a0d6980
2017-03-09 18:35:40 +00:00
Dmitry Dementyev
4ea31956fb
resolve merge conflicts of 3964c51bf2
to nyc-dev am: 0f04a5a93f
am: 8c5c5b5cec
am: 3b5b2d6d20
am: c28fb3e071
am: 5330df501f
...
am: 7a3593cbc6
-s ours
Change-Id: Iab4a431d43dade3cbe26b5be7e4166f090a26d2e
2017-03-09 18:35:27 +00:00
Dmitry Dementyev
dd48f602bb
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258
am: 3a5e567ab9
am: b7e2545217
am: def3eddb43
am: 3964c51bf2
-s ours am: f1fb452863
am: 2569925151
am: efb9f74486
am: d5f3ae5cac
...
am: 0fb3d55e3a
Change-Id: I6c19c6e9ee3586ee954ffe6fc195072c073b489e
2017-03-09 18:32:28 +00:00
Dmitry Dementyev
7a3593cbc6
resolve merge conflicts of 3964c51bf2
to nyc-dev am: 0f04a5a93f
am: 8c5c5b5cec
am: 3b5b2d6d20
am: c28fb3e071
...
am: 5330df501f
Change-Id: I32c0ac9a2a38b01417ccf9135b4bfc002af68cc7
2017-03-09 18:32:13 +00:00
Dmitry Dementyev
0fb3d55e3a
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258
am: 3a5e567ab9
am: b7e2545217
am: def3eddb43
am: 3964c51bf2
-s ours am: f1fb452863
am: 2569925151
am: efb9f74486
...
am: d5f3ae5cac
Change-Id: Iacd8197fe2d48921a7b5adc71298ae8a00bb871d
2017-03-09 18:29:27 +00:00
Dmitry Dementyev
5330df501f
resolve merge conflicts of 3964c51bf2
to nyc-dev am: 0f04a5a93f
am: 8c5c5b5cec
am: 3b5b2d6d20
...
am: c28fb3e071
Change-Id: I1944207165459d9bbd946eb6f30b18809a561c3c
2017-03-09 18:29:12 +00:00
Dmitry Dementyev
d5f3ae5cac
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258
am: 3a5e567ab9
am: b7e2545217
am: def3eddb43
am: 3964c51bf2
-s ours am: f1fb452863
am: 2569925151
...
am: efb9f74486
Change-Id: I947fecd7b54fac9c3253decff4d635cad7706baa
2017-03-09 18:25:27 +00:00
Dmitry Dementyev
c28fb3e071
resolve merge conflicts of 3964c51bf2
to nyc-dev am: 0f04a5a93f
am: 8c5c5b5cec
...
am: 3b5b2d6d20
Change-Id: I52945a6de0678ae91a1eba0201dc252402146260
2017-03-09 18:25:11 +00:00
Dmitry Dementyev
efb9f74486
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258
am: 3a5e567ab9
am: b7e2545217
am: def3eddb43
am: 3964c51bf2
-s ours am: f1fb452863
...
am: 2569925151
Change-Id: I9462ba01dda65034a82df27a0b7aaf2de14591b0
2017-03-09 18:22:27 +00:00
Dmitry Dementyev
3b5b2d6d20
resolve merge conflicts of 3964c51bf2
to nyc-dev am: 0f04a5a93f
...
am: 8c5c5b5cec
Change-Id: I56f7364b5b70fe41a5d09fbaf334c0e15f073750
2017-03-09 18:22:11 +00:00
Dmitry Dementyev
2569925151
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258
am: 3a5e567ab9
am: b7e2545217
am: def3eddb43
am: 3964c51bf2
-s ours
...
am: f1fb452863
Change-Id: I074be985f7e09f1d7bac6936d7cadc25a9b8afba
2017-03-09 18:19:26 +00:00
Dmitry Dementyev
8c5c5b5cec
resolve merge conflicts of 3964c51bf2
to nyc-dev
...
am: 0f04a5a93f
Change-Id: I5bb82c0b56e43903d10304007bc17165be3c23f9
2017-03-09 18:19:10 +00:00
Dmitry Dementyev
f1fb452863
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258
am: 3a5e567ab9
am: b7e2545217
am: def3eddb43
...
am: 3964c51bf2
-s ours
Change-Id: I8f8c6bd49cc10addae1408f1cfb8b2200184a999
2017-03-09 18:16:23 +00:00
William Luh
a67df03cfb
Merge "Initialize injected Security preferences."
2017-03-09 17:08:11 +00:00
TreeHugger Robot
a7e95c27fe
Merge "Update layout and strings for DO Disclosures"
2017-03-09 12:33:06 +00:00
TreeHugger Robot
5ec2747426
Merge "Add CA certs Privacy Settings page"
2017-03-09 10:51:14 +00:00
TreeHugger Robot
a8855922c9
Merge "Misc fixes"
2017-03-09 06:09:58 +00:00
TreeHugger Robot
646aac727d
Merge "Change advaned button text color"
2017-03-09 04:07:02 +00:00
TreeHugger Robot
9afc031791
Merge "Fix layout for time zone picker"
2017-03-09 03:57:22 +00:00
TreeHugger Robot
7cea6b2429
Merge "Update theme setting to not require reboot"
2017-03-09 03:14:58 +00:00
Fan Zhang
fcdfa4afa6
Change advaned button text color
...
Test: visual
Change-Id: I5a7155ac9dfa8dc4b48ba17a937c9c4b03eb2868
2017-03-08 18:14:40 -08:00
TreeHugger Robot
a2a09c9ce2
Merge "Adding app specific screen for "External Sources""
2017-03-09 01:22:01 +00:00
Jason Monk
2859b9a302
Update theme setting to not require reboot
...
Add calls into the OverlayManagerService to update the overlays
directly and remove reboot dialog.
Test: make RunSettingsRobotTests
Change-Id: I92841e643eab70b4b194f60cce95ce3cedb75972
Fixes: 34701451
2017-03-08 20:20:16 -05:00
Dmitry Dementyev
0f04a5a93f
resolve merge conflicts of 3964c51bf2
to nyc-dev
...
Bug: 33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
2017-03-08 17:12:40 -08:00
TreeHugger Robot
69ef3f4e69
Merge "Add dividers on a few preferences"
2017-03-09 01:03:11 +00:00
William Luh
91eaa85c52
Initialize injected Security preferences.
...
Previously a default "G" icon was loaded before the injected ones and
this would be visually jarring. Also the text summary would cause the
titles to shift up, so now load an empty icon and empty summary so no
more jarring visual effects.
Bug: 35994047
Test: make RunSettingsRoboTests
Change-Id: Ia06535215432fe350a3bb06f541e817a566772e0
2017-03-08 16:43:42 -08:00
Fan Zhang
1447da277b
Fix layout for time zone picker
...
Change-Id: I2f1dedac7d747901978ef5d4a1a58bae2fa02921
Fix: 35856915
Test: make RunSettingsRoboTests
2017-03-08 16:28:02 -08:00
Fan Zhang
92831fc7ad
Misc fixes
...
- Deprecate CopyablePreference
- Update search icon for connected device page
Fix: 36006104
Fix: 35948464
Test: make RunSettingsRoboTests
Change-Id: I0f48028b50d347484b4dd2c7844e782d374715d4
2017-03-08 15:30:39 -08:00
Fan Zhang
fbefd9ea01
Add dividers on a few preferences
...
Fix: 36023418
Fix: 36058273
Test: visual
- On top of emergency preference
- On top of footer preference
Change-Id: Iefbbf0ad410d46c466f919ecb60b572dd6f1ea28
2017-03-08 15:29:25 -08:00
jackqdyulei
391bf71ba2
Add background activity toggle in Battery settings
...
We will show this preference only if the app is target prior to O
(targetSdk < O)
Bug: 33454801
Test: RunSettingsRoboTests
Change-Id: Ibd6a2147b8e7b49d2b7e3176296dd9b91ee4cc6f
2017-03-08 15:07:24 -08:00
TreeHugger Robot
e32788c630
Merge "Misc fix for secondary user"
2017-03-08 22:32:46 +00:00
Stephen Chen
53d0de2171
Merge "Show Search button in menu of Wifi Preferences page."
2017-03-08 22:24:52 +00:00
Stephen Chen
5bd534e3fc
Merge "Remove refresh button from WifiSettings."
2017-03-08 21:46:59 +00:00
Felipe Leme
4fa4a2e3f5
Replaced auto-fill by autofill to keep it consistent with API style.
...
To keep backward compatibility, it looks for the new service (AutofillService),
then falls back to the old one (AutoFillService) if not found.
Bug: 35956626
Bug: 36024626
Test: manual verification with a custom service
Test: RunSettingsRoboTests passes
Change-Id: I64112ac5d796e94866e632ec8ea79a3fb13e3d9b
2017-03-08 13:45:27 -08:00
Fan Zhang
a6986e7ed2
Misc fix for secondary user
...
- Theme fix: action bar and status bar color now have enough contrast
for SUW theme.
- Fix a ConcurrentModificationError when switching between users
quickly.
Change-Id: If31f88e36f1d4c5d7f90bc9d128041f0e0a81ff9
Fix: 35948464
Test: make RunSettingsRoboTests
2017-03-08 13:09:17 -08:00
Stephen Chen
8e0111ddde
Merge "Create NetworkScorerPicker preference controller to set preference summary."
2017-03-08 21:04:44 +00:00
Stephen Chen
f580ccec19
Show Search button in menu of Wifi Preferences page.
...
Bug: 36066060
Change-Id: Ia40ca8750cfc5233926b6156bb9262b071bb3b85
Test: verify on device.
2017-03-08 12:40:18 -08:00
Stephen Chen
9f5aaa4e5f
Remove refresh button from WifiSettings.
...
Bug: 34891524
Test: b/34673204 for instrumentation tests. Verified button is removed.
Change-Id: I0b30d36bd6b3f0b1361ef4f7dc775ed3545a7bdc
2017-03-08 11:58:13 -08:00
TreeHugger Robot
690d0cfdd0
Merge "SecuritySubSettings: Show trust agent label on lock timeout setting"
2017-03-08 19:54:11 +00:00
Dmitry Dementyev
3964c51bf2
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258
am: 3a5e567ab9
am: b7e2545217
...
am: def3eddb43
Change-Id: I103086932e0f5071b1fa554a9e11a524b0d36d7d
2017-03-08 19:17:42 +00:00
Dmitry Dementyev
def3eddb43
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258
am: 3a5e567ab9
...
am: b7e2545217
Change-Id: I40643a3a88c3ec9344604917dd0e765cd9078f29
2017-03-08 19:15:40 +00:00
Dmitry Dementyev
b7e2545217
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258
...
am: 3a5e567ab9
Change-Id: Ie14fd1ef35f12fffadf4e241e3cd8146a1063d8a
2017-03-08 19:13:10 +00:00