Doris Ling
397a1b80ef
Merge "Add logging to Bluetooth settings."
2017-03-13 17:24:14 +00:00
Maurice Lam
019593072b
Update fingerprint enrolling flow
...
1. Make FingerprintEnrollFinish stay on the back stack during "add
another"
2. Remove skip button from the enrolling screen, since the user can
now back out of the enrollment flow, or back to
FingerprintEnrollFinish and press "done" there.
Test: Run FingerprintEnrollFinishTest with `am instrument`
Bug: 32054268
Change-Id: Icaf017952d6582a14b4d0904b7ee67ad22e5280d
2017-03-13 10:22:06 -07:00
Matthew Fritze
2beb03f4b7
Add optional feedback button for settings search
...
Adds mechanism for adding a button in the search screen
and stubs to show and hide the button.
Fixes: 35164702
Test: make -j40 RunSettingsRoboTests
Change-Id: I34d245e84b62cedf2dc6e5de4ea336c5a99ffd31
2017-03-13 09:55:05 -07:00
Paul Lawrence
5b729c3216
Fix convert to fbe
...
Bug: 35231198
Test: Convert to fbe now works
Change-Id: Icc468d4f9328aacc18ba9e7b053e8db1a9aa9c8d
2017-03-13 09:19:04 -07:00
Gustav Sennton
72c7a83141
Merge "WebView implementation Dev setting: Show the version number after name"
2017-03-13 14:25:28 +00:00
Jeff Sharkey
0f0e3adac8
Merge commit '11324dcedfd9d4cccba0b1e493c44fe80bb05da4' into manual_merge_11324dcedf
...
Change-Id: Icd2605fd1572dd21bb27a7d42bc62ba9b06bd9ad
2017-03-12 17:22:21 -06:00
Jeff Sharkey
11324dcedf
Merge "Fix network name for Passpoint network" am: 742bd03f12
...
am: a41debeacd
2017-03-12 23:13:42 +00:00
Jeff Sharkey
a41debeacd
Merge "Fix network name for Passpoint network"
...
am: 742bd03f12
2017-03-12 23:09:11 +00:00
Jeff Sharkey
742bd03f12
Merge "Fix network name for Passpoint network"
2017-03-12 23:03:20 +00:00
Bill Yi
dfd82f4c33
Import translations. DO NOT MERGE
...
Change-Id: I941f388954df5fb352ae2020def665c2600884f0
Auto-generated-cl: translation import
2017-03-12 10:30:17 -07:00
TreeHugger Robot
9ba477b62b
Merge "Add setting for the assist gesture sensitivity control."
2017-03-11 03:17:38 +00:00
TreeHugger Robot
75ff40e409
Merge "Add DynamicAvailabilityPreferenceController"
2017-03-11 03:07:31 +00:00
Philip Quinn
5473f68cdd
Add setting for the assist gesture sensitivity control.
...
The sensitivity control is only visible when the assist gesture itself
is enabled.
Test: make -j RunSettingsRoboTests; manual test on supported/unsupported
configurations.
Change-Id: I584975794c5cf9d788e93167292d142ae2faf1c5
2017-03-10 17:23:14 -08:00
TreeHugger Robot
700fc363ef
Merge "Fix the Storage settings title."
2017-03-11 00:01:15 +00:00
TreeHugger Robot
f0110a1de7
Merge "Use color accent as background color for app info pages."
2017-03-10 23:58:30 +00:00
TreeHugger Robot
85478422e2
Merge "Disable wifi display activity if device can't support it."
2017-03-10 23:35:26 +00:00
Daniel Nishi
325d38043f
Category breakdown size should match total size.
...
The system apps' base size was not being properly attributed
to the system. This was causing the storage to go totally
unattributed (and causing roughly a 1GB gap in sizes.) On my
test device, the sizes now sum properly.
Change-Id: Ibc13015e40f854090a7a3ec09eef4c5c52918e0f
Fixes: 35144717
Test: Settings robo
2017-03-10 15:15:42 -08:00
Fan Zhang
6a56b8feb0
Merge "Refactor sound setting -> work profile initialization logic."
2017-03-10 22:39:31 +00:00
Bartosz Fabianowski
436873f156
Add DynamicAvailabilityPreferenceController
...
This is a PreferenceController that correctly handles the case of
isAvailable() changing dynamically, while the Settings page containing
the preference in question is open.
Bug: 32692748
Test: m RunSettingsRoboTests
Change-Id: I95e22bbc7bdc17bacd2bf6b82fa5b535494d5bce
2017-03-10 23:25:36 +01:00
Doris Ling
b2032416e9
Use color accent as background color for app info pages.
...
Bug: 34977561
Test: visual
Change-Id: Idc03d33a318d7908a47e76738f7d098ab60fb0fe
2017-03-10 14:15:14 -08:00
TreeHugger Robot
f11c16710c
Merge "Update the Manage Storage preference."
2017-03-10 22:01:58 +00:00
Daniel Nishi
f4febcc7bb
Fix the Storage settings title.
...
The wrong resource id was passed in for the title.
Change-Id: I5d4bc4d127903f58c0df671504a140fe883c2f17
Fixes: 35961000,36126458
Test: Manual
2017-03-10 13:15:25 -08:00
Fan Zhang
4fcd5ed29f
Disable wifi display activity if device can't support it.
...
Change-Id: I19ab9d0d480b66e56b87cef7c49d4391a3608111
Fix: 36069170
Test: make RunSettingsRoboTests
2017-03-10 13:03:47 -08:00
Evan Laird
3822f122a7
Add battery percentage switch to display settings
...
Test: mmma packages/apps/Settings/tests/robotests
Bug:32539932
Change-Id: I08c1d0f3b6cb8be7d1456268498356f7ed833e5c
2017-03-10 14:35:40 -05:00
Anton Philippov
a540a978bc
Merge "Hide "Factory reset" item for secondary users"
2017-03-10 19:05:19 +00:00
Marie Janssen
14ef1e4417
Bluetooth: leave screen off for permission request
...
Test: pair to a carkit, disable pbap, reconnect from carkit
Bug: 32555940
Change-Id: I06d6cc0873f9f991e68f1de9b629dbe3a7bb7701
2017-03-10 09:57:03 -08:00
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
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
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
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
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
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
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
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
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
2017-03-09 18:22:27 +00:00
Dmitry Dementyev
3b5b2d6d20
resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f
...
am: 8c5c5b5cec
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
2017-03-09 18:19:26 +00:00
Dmitry Dementyev
8c5c5b5cec
resolve merge conflicts of 3964c51bf2 to nyc-dev
...
am: 0f04a5a93f
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
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
