OSDN Git Service
Jay [Wed, 15 Mar 2017 19:28:57 +0000 (19:28 +0000)]
Merge "Improve Wi-Fi Settings UI in guest mode" am:
31f64a1253 am:
241d902200
am:
94854cc57b -s ours
Change-Id: Iffe4bd1fac36c1b51748b802308b3b5dcf5ccb54
Jay [Wed, 15 Mar 2017 19:24:13 +0000 (19:24 +0000)]
Merge "Improve Wi-Fi Settings UI in guest mode" am:
31f64a1253
am:
241d902200
Change-Id: I945b4604a82b8fccc2c24ea3faf1d7b299b3cfb7
Jay [Wed, 15 Mar 2017 19:18:43 +0000 (19:18 +0000)]
Merge "Improve Wi-Fi Settings UI in guest mode"
am:
31f64a1253
Change-Id: I15f05538344aa615a4f69eebf7fdec66efc3cf29
Treehugger Robot [Wed, 15 Mar 2017 19:11:25 +0000 (19:11 +0000)]
Merge "Improve Wi-Fi Settings UI in guest mode"
Jay [Thu, 14 Jul 2016 08:31:03 +0000 (16:31 +0800)]
Improve Wi-Fi Settings UI in guest mode
Progress bar is still seen along with a permission forbidden tip in
guest mode and it's confusing. It should be hidden because actually
nothing happens there.
When Wi-Fi is off, Wi-Fi OFF tip should be shown even in guest mode
becuase it should be consistent with Wi-Fi status.
Improves
d8c3ca43163427a75c8b70114096238177f97af0.
Bug:
31235488
Test: manual inspection.
Change-Id: I611719db253a0aec03d61e881af0e5dc3869d50b
Merged-In: If89728e293721cea45dcd717316d87f6df17ea7c
Lei Yu [Wed, 15 Mar 2017 17:23:44 +0000 (17:23 +0000)]
Merge "Update todo list comment in PowerUsageAdvanced"
TreeHugger Robot [Wed, 15 Mar 2017 16:37:00 +0000 (16:37 +0000)]
Merge "Remove unused import."
TreeHugger Robot [Wed, 15 Mar 2017 15:52:02 +0000 (15:52 +0000)]
Merge "Fix convert to fbe"
Andrew Scull [Wed, 15 Mar 2017 14:32:27 +0000 (14:32 +0000)]
Remove unused import.
Missed the cleanup step from previous CL.
Test: it builds
Change-Id: I62494994731189f962ca2dd26a7c3283784792ed
TreeHugger Robot [Wed, 15 Mar 2017 14:11:34 +0000 (14:11 +0000)]
Merge "Disallow fingerprint based on user unlock state."
Andrew Scull [Wed, 15 Mar 2017 12:42:18 +0000 (12:42 +0000)]
Disallow fingerprint based on user unlock state.
Previously, the KeyStore lock state was used but this doesn't hold any
real value and may be removed in future. The user unlock state is the
source of truth we are looking for.
Test: Enroll finger, turn off work, lock and unlock device, turn on
work, asked for pin but can no longer user fingerprint.
Fixes:
34858001
Change-Id: I228952f4f7fd24916d294b5b523c6d3609520506
TreeHugger Robot [Wed, 15 Mar 2017 04:03:57 +0000 (04:03 +0000)]
Merge "Fix Wi-Fi Settings Guest mode UI."
TreeHugger Robot [Wed, 15 Mar 2017 02:43:11 +0000 (02:43 +0000)]
Merge "Revert "Make IME handling deterministic in CryptKeeper""
Stephen Chen [Wed, 15 Mar 2017 02:28:04 +0000 (19:28 -0700)]
Fix Wi-Fi Settings Guest mode UI.
Progress bar should not show in guest mode when onViewCreated.
When Wi-Fi is off, Wi-Fi OFF tip should be shown even in guest
mode to be consistent with Wi-Fi status.
Bug:
35627922
Test: tracked in b/
35324506
Change-Id: If89728e293721cea45dcd717316d87f6df17ea7c
TreeHugger Robot [Wed, 15 Mar 2017 01:45:27 +0000 (01:45 +0000)]
Merge "Fix calculation of Access Point Level."
TreeHugger Robot [Wed, 15 Mar 2017 01:40:45 +0000 (01:40 +0000)]
Merge "Clarify meaning of string"
Tom Cherry [Wed, 15 Mar 2017 01:09:42 +0000 (01:09 +0000)]
Revert "Make IME handling deterministic in CryptKeeper"
This reverts commit
4ae46cd1ad0725c8049c3954de19874df8483983.
Bug:
36148078
Change-Id: I776ad2e6ba0eabacb3d6be6de23ba37fe5ce7bc7
TreeHugger Robot [Wed, 15 Mar 2017 01:03:19 +0000 (01:03 +0000)]
Merge "Create the Wifi Network Details Page."
Sundeep Ghuman [Mon, 13 Mar 2017 22:52:40 +0000 (15:52 -0700)]
Fix calculation of Access Point Level.
Bug: b/
35854026
Test: make RunSettingsRoboTests
Change-Id: I5287e8c7b46a463cfa25659c756f6ca9175cb68c
Bartosz Fabianowski [Tue, 14 Mar 2017 23:16:00 +0000 (00:16 +0100)]
Clarify meaning of string
Translators got confused by one of the strings. Add a more
detaled explanation what the string refers to.
Bug:
36170404
Test: None
Change-Id: I7a66fcd5943205501188c5fca2e68630e447f69f
Sundeep Ghuman [Tue, 28 Feb 2017 02:21:53 +0000 (18:21 -0800)]
Create the Wifi Network Details Page.
This page should not be searchable, as it corresponds to a specific
access point, thus click on a search result would not have an access
point in which to open.
Fix WifiPicker bugs b/
35883232 and b/
35951638 that deal with UI jank.
Bug:
34713316
Test: Tracked in b/
35963536 and to be implemented in an immediate follow
up CL.
Change-Id: Iad7f26c7f04c3fc7d07a8e9188843eeb4d44cd36
TreeHugger Robot [Tue, 14 Mar 2017 22:21:22 +0000 (22:21 +0000)]
Merge "Add Advanced button to Apps & notifications page."
TreeHugger Robot [Tue, 14 Mar 2017 21:46:33 +0000 (21:46 +0000)]
Merge "Display recents when search fragment open."
Doris Ling [Mon, 13 Mar 2017 21:36:12 +0000 (14:36 -0700)]
Add Advanced button to Apps & notifications page.
- set the progressive mixin to show 3 items initially.
Change-Id: I874982e9b230d5b6afe4f2ced8e8c8c4dd84ba79
Fix:
36177949
Test: visual
Doris Ling [Tue, 14 Mar 2017 20:20:36 +0000 (20:20 +0000)]
Merge "Update the ordering of the homepage tiles."
TreeHugger Robot [Tue, 14 Mar 2017 20:11:16 +0000 (20:11 +0000)]
Merge "Update fingerprint enrolling flow"
Lei Yu [Tue, 14 Mar 2017 20:01:32 +0000 (20:01 +0000)]
Merge "Remove hardcoded color for settings dashboard"
Fan Zhang [Tue, 14 Mar 2017 01:09:29 +0000 (18:09 -0700)]
Display recents when search fragment open.
Bug:
27391895
Test: make RunSettingsRoboTests
Change-Id: I62cfa35af96babf85a795910aa76dc774e2b80f2
jackqdyulei [Thu, 9 Mar 2017 20:48:54 +0000 (12:48 -0800)]
Remove hardcoded color for settings dashboard
1. Change card_background to default background color. In settings
light theme, background color is exactly the #fafafa
2. Change card_background_grey to colorSecondary, which is
material_grey_200 in settings light theme.
Bug:
36139640
Test: Screenshot
Change-Id: I20081e768985ce6c0b9000448ae48599f18b293a
TreeHugger Robot [Tue, 14 Mar 2017 17:17:14 +0000 (17:17 +0000)]
Merge "Add misc logging:"
jackqdyulei [Tue, 14 Mar 2017 17:05:06 +0000 (10:05 -0700)]
Update todo list comment in PowerUsageAdvanced
Bug:
34385770
Test: Manual
Change-Id: Ifca1d1251d9735cf33e3a919d773ec03a9b2f644
TreeHugger Robot [Tue, 14 Mar 2017 01:32:10 +0000 (01:32 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 14 Mar 2017 00:44:02 +0000 (00:44 +0000)]
Merge "Update strings and layout for enterprise privacy"
TreeHugger Robot [Tue, 14 Mar 2017 00:38:09 +0000 (00:38 +0000)]
Merge "Only crop photos owned by Settings."
Daniel Nishi [Tue, 14 Mar 2017 00:11:58 +0000 (00:11 +0000)]
Merge "Count legacy games as games in Storage view."
TreeHugger Robot [Mon, 13 Mar 2017 23:38:55 +0000 (23:38 +0000)]
Merge "Update string s/celluar/mobile/g"
TreeHugger Robot [Mon, 13 Mar 2017 23:38:40 +0000 (23:38 +0000)]
Merge "Swipe to dismiss suggestions"
Fan Zhang [Mon, 13 Mar 2017 21:37:59 +0000 (14:37 -0700)]
Add misc logging:
- Button clicks in app detail page:
uninstall/disable/clear data/clear cache
- More logging in search:
log inline search result click, and its metadata such as
name/value/rank.
Fix:
32652772
Fix:
32798201
Test: make RunSettingsRoboTests
Change-Id: I90cef7c9ea9ea69ea9cf083013a38417097f8594
Yohei Yukawa [Mon, 13 Mar 2017 23:30:18 +0000 (23:30 +0000)]
Merge "Make IME handling deterministic in CryptKeeper"
Bartosz Fabianowski [Fri, 10 Mar 2017 14:47:14 +0000 (15:47 +0100)]
Update strings and layout for enterprise privacy
This CL continues the finalization of UI layout and strings for the
enterprise privacy page:
* Turn footer into a header
* Update strings
* Dynamically generate summaries for entry points in security page
Bug:
32692748
Test: m RunSettingsRoboTests
Change-Id: Ibf248ac269380fb1b919b01f88f721130060b7f9
Daniel Nishi [Mon, 13 Mar 2017 22:10:59 +0000 (22:10 +0000)]
Merge "Don't show owner as a secondary user."
Fan Zhang [Mon, 13 Mar 2017 21:56:08 +0000 (14:56 -0700)]
Update string s/celluar/mobile/g
Change-Id: If2f8d8ceca709c61d435894ab31d12b6bf8f3582
Fix:
34833792
Test: builds
Yohei Yukawa [Mon, 13 Mar 2017 20:27:59 +0000 (13:27 -0700)]
Make IME handling deterministic in CryptKeeper
We have been receiving more and more strange bug reports regarding
the initial IME visibility on CryptKeeper (Bug
31915865, Bug
35198715,
and Bug
36148078). Most likely we have introduced more bugs before
fixing previous bugs.
As the first step to disentangle multiple problems, this CL addresses
a long standing issue that CryptKeeper relies on @hide internal API
InputMethodManager#showSoftInputUnchecked(). As explained in
Bug
36015425, IMM#showSoftInputUnchecked() is considered harmful in
terms of bypassing standard IME focus handling flows, which prevents
us from taking advantage of historical debugging mechanism that we
have added recently in Bug
35079353.
Test: Manually verified that Bug
31915865 is still broken but this CL
does not make it worse.
1. Flash an image into a non direct-boot device.
2. Set up a device boot password.
3. adb reboot
After the step 3, the software keyboard shows up automatically
then suddenly disappears (Bug
35198715).
Bug:
36015425
Change-Id: I3cffeec286d9372ff05e85a49b82287cb1add8a2
Fan Zhang [Thu, 23 Feb 2017 00:41:38 +0000 (16:41 -0800)]
Swipe to dismiss suggestions
- Move dismiss suggestion logic into feature provider
- In DashboardData, use hashcode as suggestion's stable id. This is much
more likely to provide a truely stable id for each suggestion card.
Eventually I want to use hash for all tiles to provide stable id.
- Add a SuggestionDismissionController to handle swipe to dismiss
callbacks
Change-Id: If3770f07a90c5469a0b86fc28f3eb5e4c17227cd
Fix:
35159816
Test: make RunSettingsRoboTests
TreeHugger Robot [Mon, 13 Mar 2017 21:26:29 +0000 (21:26 +0000)]
Merge "Extends the touch area for the switch in Master Switch preference."
TreeHugger Robot [Mon, 13 Mar 2017 21:02:26 +0000 (21:02 +0000)]
Merge "Prevent whitelisted apps from blocking and silencing"
Daniel Nishi [Fri, 10 Mar 2017 23:05:12 +0000 (15:05 -0800)]
Count legacy games as games in Storage view.
The old Games flag was being ignored for categorization.
This caused the very few games which used the flag to be
miscategorized as "Other apps."
Change-Id: Ib8650d1c43579bc1698576c09c884e5a7bc4626d
Fixes:
36109122
Test: Settings robotest
TreeHugger Robot [Mon, 13 Mar 2017 20:11:35 +0000 (20:11 +0000)]
Merge "Specify disallowed action in AdminSupportDetailsDialog"
Matthew Fritze [Mon, 13 Mar 2017 19:39:49 +0000 (19:39 +0000)]
Merge "Add optional feedback button for settings search"
Doris Ling [Fri, 10 Mar 2017 23:52:30 +0000 (15:52 -0800)]
Update the ordering of the homepage tiles.
Lower the priority of System and Support settings to be negative so that
they will appear below dynamic tiles with default priority.
Change-Id: I4c0122aa54c5947cfcc7beb7f50b5ef720c8b9f0
Fix:
35928954
Test: make RunSettingsLibRoboTests
Daniel Nishi [Fri, 10 Mar 2017 23:52:02 +0000 (15:52 -0800)]
Don't show owner as a secondary user.
Change-Id: I0a67eb176528a0f95595107b12c6ecc679a1041f
Fixes:
36138657
Test: Robotest
TreeHugger Robot [Mon, 13 Mar 2017 19:09:45 +0000 (19:09 +0000)]
Merge "Add battery percentage switch to display settings"
Julia Reynolds [Mon, 6 Mar 2017 20:24:35 +0000 (15:24 -0500)]
Prevent whitelisted apps from blocking and silencing
Change-Id: I34cb5c2c59d56b68ed1500c8c79cd65676c0af25
Fixes:
35841524
Test: manual
Jeff Sharkey [Mon, 13 Mar 2017 18:37:52 +0000 (12:37 -0600)]
Only crop photos owned by Settings.
A recent security change locks down the ability for the system UID to
issue Uri permission grants. This helps mitigate an entire class of
confused deputy security issues.
However, Settings (which runs as the system UID) was still relying on
issuing Uri permission grants to the photo cropper. The simplest way
to keep that working is to add the "com.android.settings.files"
authority to a whitelist, and only request cropping of Uris from that
location.
This means that if the GET_CONTENT decides to return a Uri (instead
of streaming it into mTakePictureUri), then we need to copy it
ourselves locally before we can send it along to the cropper.
Test: builds, boots, both take/choose photos work
Bug:
33019296,
35158271
Change-Id: I2541c33e8d9452357cb9fc2e021ca74d5a43d5ff
Saige McVea [Mon, 13 Mar 2017 18:30:40 +0000 (18:30 +0000)]
Merge "Revert "Accessibility settings refresh.""
Saige McVea [Mon, 13 Mar 2017 18:04:00 +0000 (18:04 +0000)]
Revert "Accessibility settings refresh."
This reverts commit
89a5c629631c8ffbfd3f32d2f7b3ebd978b0b992.
Change-Id: I97e420e4f78ee3e48b8aa10c8f5c1e2861032fab
phweiss [Wed, 8 Mar 2017 18:55:48 +0000 (19:55 +0100)]
Specify disallowed action in AdminSupportDetailsDialog
The title of an AdminSupportDetailsDialog "Action not allowed" is
replaced by specialized strings such as "Screenshot not allowed" if
the action is specified by the extra DevicePolicyManager.EXTRA_RESTRICTION
in the calling intent.
This is done because these intents can be created by
third-party apps via the new public API
DevicePolicyManager.createAdminSupportIntent, and the disallowed action
might not be obvious in context of the third party app.
Bug:
31215663
Test: CtsVerifier in separate CL
Change-Id: I0c9e360cea34bec8eda29d86c5bf55d8c38c47ec
Doris Ling [Mon, 13 Mar 2017 17:29:34 +0000 (10:29 -0700)]
Extends the touch area for the switch in Master Switch preference.
- set view click listener on the entire widget view instead of only
listening to the switch button event.
- move the preference layout end padding into the widget frame, so that
clicking on the empty space at the end will send the click event to the
widget frame instead of the preference view.
Change-Id: I98025f723465f3941cebbbd03b812209c0240590
Fix:
35872094
Test: make RunSettingsRoboTests
Doris Ling [Mon, 13 Mar 2017 17:24:13 +0000 (17:24 +0000)]
Merge "Add logging to Bluetooth settings."
Maurice Lam [Wed, 8 Mar 2017 00:42:11 +0000 (16:42 -0800)]
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
Matthew Fritze [Tue, 21 Feb 2017 18:20:40 +0000 (10:20 -0800)]
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
Paul Lawrence [Fri, 10 Mar 2017 22:22:24 +0000 (14:22 -0800)]
Fix convert to fbe
Bug:
35231198
Test: Convert to fbe now works
Change-Id: Icc468d4f9328aacc18ba9e7b053e8db1a9aa9c8d
Gustav Sennton [Mon, 13 Mar 2017 14:25:27 +0000 (14:25 +0000)]
Merge "WebView implementation Dev setting: Show the version number after name"
Jeff Sharkey [Sun, 12 Mar 2017 23:22:21 +0000 (17:22 -0600)]
Merge commit '
11324dcedfd9d4cccba0b1e493c44fe80bb05da4' into manual_merge_11324dcedf
Change-Id: Icd2605fd1572dd21bb27a7d42bc62ba9b06bd9ad
Jeff Sharkey [Sun, 12 Mar 2017 23:13:42 +0000 (23:13 +0000)]
Merge "Fix network name for Passpoint network" am:
742bd03f12
am:
a41debeacd
Change-Id: I6cffc06b4d792501fd3cc158cbc119b3c388c9be
Jeff Sharkey [Sun, 12 Mar 2017 23:09:11 +0000 (23:09 +0000)]
Merge "Fix network name for Passpoint network"
am:
742bd03f12
Change-Id: Ia9ae9d6034f72be5f8d34340efce5b52d71fa6c2
Jeff Sharkey [Sun, 12 Mar 2017 23:03:20 +0000 (23:03 +0000)]
Merge "Fix network name for Passpoint network"
Bill Yi [Sun, 12 Mar 2017 17:30:17 +0000 (10:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I941f388954df5fb352ae2020def665c2600884f0
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 11 Mar 2017 03:17:37 +0000 (03:17 +0000)]
Merge "Add setting for the assist gesture sensitivity control."
TreeHugger Robot [Sat, 11 Mar 2017 03:07:30 +0000 (03:07 +0000)]
Merge "Add DynamicAvailabilityPreferenceController"
Philip Quinn [Mon, 6 Mar 2017 21:37:42 +0000 (13:37 -0800)]
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
TreeHugger Robot [Sat, 11 Mar 2017 00:01:14 +0000 (00:01 +0000)]
Merge "Fix the Storage settings title."
TreeHugger Robot [Fri, 10 Mar 2017 23:58:29 +0000 (23:58 +0000)]
Merge "Use color accent as background color for app info pages."
TreeHugger Robot [Fri, 10 Mar 2017 23:35:26 +0000 (23:35 +0000)]
Merge "Disable wifi display activity if device can't support it."
Fan Zhang [Fri, 10 Mar 2017 22:39:30 +0000 (22:39 +0000)]
Merge "Refactor sound setting -> work profile initialization logic."
Bartosz Fabianowski [Fri, 10 Mar 2017 22:23:17 +0000 (23:23 +0100)]
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
Doris Ling [Fri, 10 Mar 2017 22:15:14 +0000 (14:15 -0800)]
Use color accent as background color for app info pages.
Bug:
34977561
Test: visual
Change-Id: Idc03d33a318d7908a47e76738f7d098ab60fb0fe
TreeHugger Robot [Fri, 10 Mar 2017 22:01:57 +0000 (22:01 +0000)]
Merge "Update the Manage Storage preference."
Daniel Nishi [Thu, 9 Mar 2017 01:36:30 +0000 (17:36 -0800)]
Fix the Storage settings title.
The wrong resource id was passed in for the title.
Change-Id: I5d4bc4d127903f58c0df671504a140fe883c2f17
Fixes:
35961000,
36126458
Test: Manual
Fan Zhang [Fri, 10 Mar 2017 20:25:35 +0000 (12:25 -0800)]
Disable wifi display activity if device can't support it.
Change-Id: I19ab9d0d480b66e56b87cef7c49d4391a3608111
Fix:
36069170
Test: make RunSettingsRoboTests
Evan Laird [Fri, 10 Mar 2017 15:35:20 +0000 (10:35 -0500)]
Add battery percentage switch to display settings
Test: mmma packages/apps/Settings/tests/robotests
Bug:
32539932
Change-Id: I08c1d0f3b6cb8be7d1456268498356f7ed833e5c
Anton Philippov [Fri, 10 Mar 2017 19:05:18 +0000 (19:05 +0000)]
Merge "Hide "Factory reset" item for secondary users"
Paul Duffin [Fri, 10 Mar 2017 14:59:09 +0000 (14:59 +0000)]
Refactor code incompatible with Mockito 2.7.13
Bug:
32912773
Test: make checkbuild
Change-Id: Idcd89438aa05ed2d010934cc6613763d4cfb9885
Gustav Sennton [Fri, 10 Mar 2017 12:22:06 +0000 (12:22 +0000)]
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
TreeHugger Robot [Fri, 10 Mar 2017 07:05:35 +0000 (07:05 +0000)]
Merge "Replaced auto-fill by autofill to keep it consistent with API style."
TreeHugger Robot [Fri, 10 Mar 2017 03:40:39 +0000 (03:40 +0000)]
Merge "Fix misc style issue in "Open by default" screen."
Doris Ling [Fri, 10 Mar 2017 01:35:22 +0000 (17:35 -0800)]
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
Fan Zhang [Fri, 10 Mar 2017 02:10:07 +0000 (18:10 -0800)]
Fix misc style issue in "Open by default" screen.
Fix:
35960603
Test: visual
Change-Id: I6d3f471bb31e8c945d4d3346ad9512cda095ed64
Fan Zhang [Fri, 10 Mar 2017 00:27:22 +0000 (16:27 -0800)]
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
Fan Zhang [Thu, 9 Mar 2017 21:50:29 +0000 (13:50 -0800)]
Misc fixes
- Remove tiny icon in bluetooth subheader
- Turn new search on
Fix:
35917435
Test: make RunSettingsRoboTests
Change-Id: I97a02319108a46a0c3df2295ddec49d47f13b597
Dmitry Dementyev [Thu, 9 Mar 2017 18:35:40 +0000 (18:35 +0000)]
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
Dmitry Dementyev [Thu, 9 Mar 2017 18:35:27 +0000 (18:35 +0000)]
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
Dmitry Dementyev [Thu, 9 Mar 2017 18:32:28 +0000 (18:32 +0000)]
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
Dmitry Dementyev [Thu, 9 Mar 2017 18:32:13 +0000 (18:32 +0000)]
resolve merge conflicts of
3964c51bf2 to nyc-dev am:
0f04a5a93f am:
8c5c5b5cec am:
3b5b2d6d20 am:
c28fb3e071
am:
5330df501f
Change-Id: I32c0ac9a2a38b01417ccf9135b4bfc002af68cc7
Dmitry Dementyev [Thu, 9 Mar 2017 18:29:27 +0000 (18:29 +0000)]
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
Dmitry Dementyev [Thu, 9 Mar 2017 18:29:12 +0000 (18:29 +0000)]
resolve merge conflicts of
3964c51bf2 to nyc-dev am:
0f04a5a93f am:
8c5c5b5cec am:
3b5b2d6d20
am:
c28fb3e071
Change-Id: I1944207165459d9bbd946eb6f30b18809a561c3c
Dmitry Dementyev [Thu, 9 Mar 2017 18:25:27 +0000 (18:25 +0000)]
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
Dmitry Dementyev [Thu, 9 Mar 2017 18:25:11 +0000 (18:25 +0000)]
resolve merge conflicts of
3964c51bf2 to nyc-dev am:
0f04a5a93f am:
8c5c5b5cec
am:
3b5b2d6d20
Change-Id: I52945a6de0678ae91a1eba0201dc252402146260
Dmitry Dementyev [Thu, 9 Mar 2017 18:22:27 +0000 (18:22 +0000)]
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
Dmitry Dementyev [Thu, 9 Mar 2017 18:22:11 +0000 (18:22 +0000)]
resolve merge conflicts of
3964c51bf2 to nyc-dev am:
0f04a5a93f
am:
8c5c5b5cec
Change-Id: I56f7364b5b70fe41a5d09fbaf334c0e15f073750