OSDN Git Service
Fan Zhang [Thu, 17 Nov 2016 00:59:49 +0000 (16:59 -0800)]
Add dynamic tiles to development settings.
Remove static preference for MemorySettings and change it to dynamic
using manifest metadata.
Bug:
32623105
Test: RunSettingsRoboTests
Change-Id: Id224eb8a25fea03c75b8fb0b16842bc5b427897a
Fan Zhang [Thu, 17 Nov 2016 00:03:08 +0000 (16:03 -0800)]
Move ad-hoc dynamic tile injection into FeatureProvider.
Ideally a page should use DashboardFragment and it doesn't need to
handle adding dynamic tiles manually. This method is only designed for
page that are not fully migrated to DashboardFragment yet.
Bug:
32623105
Test: RunSettingsRoboTests
Change-Id: I0cafcddf9a43b164daea500bade869fada5b3f4e
TreeHugger Robot [Wed, 16 Nov 2016 06:33:36 +0000 (06:33 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Wed, 16 Nov 2016 04:56:50 +0000 (20:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1a8c04af27632e0ad198d561f5093fd2d24c7938
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 16 Nov 2016 03:38:00 +0000 (03:38 +0000)]
Merge "Always show at least 1% when some space used."
Sudheer Shanka [Tue, 15 Nov 2016 23:34:11 +0000 (23:34 +0000)]
Merge "Update MountService to StorageManagerService."
TreeHugger Robot [Tue, 15 Nov 2016 22:31:34 +0000 (22:31 +0000)]
Merge "Refresh Storage UI atomically."
Jeff Sharkey [Tue, 15 Nov 2016 22:17:29 +0000 (15:17 -0700)]
Always show at least 1% when some space used.
Don't let the progress value round down to 0, since that would
be misleading.
Test: builds
Bug:
24017703
Change-Id: I6a0268361645da16af67e12bf7f6823d027dd72c
Jeff Sharkey [Tue, 15 Nov 2016 21:06:44 +0000 (14:06 -0700)]
Refresh Storage UI atomically.
Test: builds
Bug:
29275971
Change-Id: I0f5131631ae12bc57e66545513ad60b7cbcd179b
TreeHugger Robot [Tue, 15 Nov 2016 17:44:53 +0000 (17:44 +0000)]
Merge "Insert dynamic dashboard tiles into optional placeholders"
TreeHugger Robot [Tue, 15 Nov 2016 02:19:00 +0000 (02:19 +0000)]
Merge "Increase char limit for the account prefererence title."
Fan Zhang [Fri, 11 Nov 2016 21:23:21 +0000 (13:23 -0800)]
Insert dynamic dashboard tiles into optional placeholders
Insteads of inserting tile onto screen using absolute priority values,
now each page can have a placeholder preference, and at run time we will
add dynamic dashboard tiles to placeholder's place.
Bug:
32827787
Test: RunSettingsRoboTests
Change-Id: I1fe9e11dce4eb6fb4a9b56af05a2b8e5cdae00d2
Doris Ling [Tue, 15 Nov 2016 00:40:23 +0000 (16:40 -0800)]
Increase char limit for the account prefererence title.
Per translators' request, increasting the character limit for the
account preference strings.
Bug:
32688421
Test: manual
Change-Id: I78198635e24d2089413d15a210ec0b9e9dfa6807
Sudheer Shanka [Tue, 15 Nov 2016 00:25:51 +0000 (00:25 +0000)]
Merge "Update usage of ActivityManagerNative."
TreeHugger Robot [Mon, 14 Nov 2016 22:20:47 +0000 (22:20 +0000)]
Merge "Update strings in Gesture Settings"
Sohani Rao [Mon, 14 Nov 2016 21:36:06 +0000 (21:36 +0000)]
Merge "Add WiFi toggle prompts - settings" am:
b4b2c2aa43 am:
6f126a8f5c am:
6cebca2599
am:
7fd676ee26 -s ours
Change-Id: I6a5d593a4291dbc25bb39c1f177539faccee0183
Sohani Rao [Mon, 14 Nov 2016 21:28:16 +0000 (21:28 +0000)]
Merge "Add WiFi toggle prompts - settings" am:
b4b2c2aa43 am:
6f126a8f5c
am:
6cebca2599
Change-Id: I8cfaadb7dd8df6d81695dea8530a25de69fcce3d
TreeHugger Robot [Mon, 14 Nov 2016 21:25:06 +0000 (21:25 +0000)]
Merge "Fix touch ripples for setup wizard screens"
Sohani Rao [Mon, 14 Nov 2016 21:21:49 +0000 (21:21 +0000)]
Merge "Add WiFi toggle prompts - settings" am:
b4b2c2aa43
am:
6f126a8f5c
Change-Id: I327d6c864ce58c21a74d628d1945f86ff518234c
Sohani Rao [Mon, 14 Nov 2016 21:14:54 +0000 (21:14 +0000)]
Merge "Add WiFi toggle prompts - settings"
am:
b4b2c2aa43
Change-Id: Idef71123fde9475a549a1ccab136564ccf3d4a4a
Sohani Rao [Mon, 14 Nov 2016 20:59:35 +0000 (20:59 +0000)]
Merge "Add WiFi toggle prompts - settings"
Sudheer Shanka [Thu, 10 Nov 2016 23:30:14 +0000 (15:30 -0800)]
Update usage of ActivityManagerNative.
Bug:
30977067
Test: N/A
Change-Id: I46e37a09cff059d2784a819bc2651d6973fbd268
Bill Yi [Mon, 14 Nov 2016 19:50:42 +0000 (19:50 +0000)]
Import translations. DO NOT MERGE am:
d13efff7aa -s ours
am:
c68492d994 -s ours
Change-Id: I7f2c8ad8971eec71a5c26e3b2ab824a73827fe1f
Bill Yi [Mon, 14 Nov 2016 19:44:02 +0000 (19:44 +0000)]
Import translations. DO NOT MERGE
am:
d13efff7aa -s ours
Change-Id: I03a2044f78ee22bc152cabc2a3c338aacd9f37fe
Lei Yu [Mon, 14 Nov 2016 19:07:49 +0000 (19:07 +0000)]
Merge "Remove hardcode for textcolor in spinner item."
Svetoslav Ganov [Wed, 27 Jul 2016 01:26:45 +0000 (18:26 -0700)]
Add WiFi toggle prompts - settings
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
Bug:
28715749
Test: Unit tests
Change-Id: I10d1231ea0c47eec5993dbe367cc0c245cba9385
Merged-In: I10d1231ea0c47eec5993dbe367cc0c245cba9385
Bill Yi [Mon, 14 Nov 2016 17:50:59 +0000 (09:50 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32839141
Change-Id: I6145b97714693ec78cbc8b7d2235ed5830e7f714
Bartosz Fabianowski [Mon, 14 Nov 2016 15:01:24 +0000 (15:01 +0000)]
Merge "Add Enterprise Privacy page to Settings"
TreeHugger Robot [Mon, 14 Nov 2016 14:16:09 +0000 (14:16 +0000)]
Merge "Add policy transparency to "Remove work profile""
Bartosz Fabianowski [Mon, 14 Nov 2016 11:04:49 +0000 (12:04 +0100)]
Add Enterprise Privacy page to Settings
This adds a new page to Settings which tells the user about his/her
privacy in light of enterprise management. The new page is only shown
on devices that have a Device Owner app set.
This CL adds a mostly blank page. Follow-up CLs will populate the page
with information about specific admin actions/policies.
The page's title ("Privacy"), icon and location in the Settings app are
tentative. The page will move to its final location once the new IA
redesign is finished.
Test: make RunSettingsRoboTests
BUG:
32692748
Change-Id: I5b5c08c0025207516b0779f54cf68234a4ba3fe4
TreeHugger Robot [Sat, 12 Nov 2016 07:41:13 +0000 (07:41 +0000)]
Merge "Import translations. DO NOT MERGE"
Andrew Sapperstein [Fri, 11 Nov 2016 23:10:56 +0000 (15:10 -0800)]
Update strings in Gesture Settings
Turns the Jump to camera string to use lowercase "camera."
The string refers to a generic camera app, not a specific one
and thus should be lower case.
Also adds periods to a bunch of the subtitles.
Bug:
32498366
Test: manual
Change-Id: I571dfb03fcceb642d328d5df816c74bc53ac90d1
Fan Zhang [Fri, 11 Nov 2016 21:23:21 +0000 (13:23 -0800)]
Remove alias for gesture settings from new IA.
The content of this page is moved to other places, so we don't need to
display it in new IA.
Bug:
32637613
Test: compiles
Change-Id: I53e4c845bf4d1986fa9b2f2e9fe1cf79f5bdaf80
Bill Yi [Fri, 11 Nov 2016 21:37:51 +0000 (13:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia5ec58e543b319ca83f28da6de12e9337f10c4bd
Auto-generated-cl: translation import
Fan Zhang [Wed, 9 Nov 2016 19:35:10 +0000 (11:35 -0800)]
Add video to each gesture preference screen.
- Refactor GesturePreference to a generic VideoPreference.
- The old video_preference.xml is only for magnification video, so
renamed.
- And use VideoPreference in gesture setting pages.
- Refactor common logic into GesturePreferenceController.
Bug:
32637613
Test: RunSettingsRoboTests
Change-Id: I58580b01a32873cb32c5dc5bf2ec021d5b1400cc
Maurice Lam [Tue, 8 Nov 2016 02:27:16 +0000 (18:27 -0800)]
Fix touch ripples for setup wizard screens
Make PreferenceTheme.SetupWizard inherit from PreferenceTheme so the
preference layout from the support library is used.
Automated tests were not added because when trying to test
SettingsActivity under Robolectric, it fails due to the lack of API
24 support.
(https://github.com/robolectric/robolectric/issues/2554)
Test: (Manual) Ripples shown when touched and keyboard focused.
Bug:
32671413
Change-Id: I5271aaddbcfdb7ee0a71bc3c223e6dc62a5ecb47
TreeHugger Robot [Thu, 10 Nov 2016 05:35:55 +0000 (05:35 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 10 Nov 2016 04:10:51 +0000 (20:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1934033fa2ee9a3b75c7d994d613a7e00b0987fa
Auto-generated-cl: translation import
jackqdyulei [Tue, 8 Nov 2016 00:23:31 +0000 (16:23 -0800)]
Remove hardcode for textcolor in spinner item.
Remove the "android:textcolor" because "Android:textAppearance"
will set the textcolor to "?attr/textColorPrimary".
Set adapter has same theme as spinner, so view inside adapter
can be inflatered correctly.
Bug:
32592245
Test: screenshot
Change-Id: If7a78ede0a029aa9fcd8f9b324a423d477c65ad7
Sudheer Shanka [Wed, 9 Nov 2016 23:47:53 +0000 (15:47 -0800)]
Update MountService to StorageManagerService.
Bug:
30977067
Test: N/A
Change-Id: I8c5eda7ed068bc7c184d559c0a27c52a74094f1a
TreeHugger Robot [Wed, 9 Nov 2016 21:13:01 +0000 (21:13 +0000)]
Merge "Add more gesture setting pages."
Julia Reynolds [Wed, 9 Nov 2016 20:38:43 +0000 (20:38 +0000)]
Merge "Allow users to pick a notification assistant."
Fan Zhang [Tue, 8 Nov 2016 21:52:58 +0000 (13:52 -0800)]
Add more gesture setting pages.
Bug:
32637613
Test: make -j40 RunSettingsRoboTests
Change-Id: I77f90b8b7e3348ed717ee78693860f48e13070f2
Lei Yu [Wed, 9 Nov 2016 18:21:10 +0000 (18:21 +0000)]
Merge "Remove hardcode color of sliding tab"
Tamas Berghammer [Wed, 9 Nov 2016 13:38:50 +0000 (13:38 +0000)]
Merge "Update package names to work with the proto3 compiler"
Fan Zhang [Wed, 9 Nov 2016 00:19:12 +0000 (00:19 +0000)]
Merge "Add setting page for swipe to notification."
Fan Zhang [Tue, 8 Nov 2016 20:45:26 +0000 (12:45 -0800)]
Add setting page for swipe to notification.
In this change input & gesture page added 5 separate gesture
preferences, each should lead to a new page to set gesture setting. For
now only swipe to notification preference is wired up. Will implement
the rest in later changes.
Bug:
32637613
Test: make RunSettingsRoboTests -j40
Change-Id: I57ceea8fcd85f3a0ab59cbd12da50b7138f5ca0c
Nathan Harold [Tue, 8 Nov 2016 19:47:49 +0000 (19:47 +0000)]
Merge changes from topic 'radio-info-ims'
* changes:
Add Ims Registration Info to RadioInfo
Enable and Disable IMS Provisioning Based on Platform Capability
Julia Reynolds [Tue, 8 Nov 2016 19:45:34 +0000 (14:45 -0500)]
Allow users to pick a notification assistant.
Test: manual. select and deselect an assistant, and verify that
the assistant can and then cannot get notification events.
Change-Id: If89c77f37170a44c827f997631aa7413da5a83e2
Fan Zhang [Tue, 8 Nov 2016 16:37:06 +0000 (16:37 +0000)]
Merge "Add Input & Gesture/Language & Region pages under System."
Tamas Berghammer [Wed, 22 Jun 2016 14:34:45 +0000 (15:34 +0100)]
Update package names to work with the proto3 compiler
Bug: b/
28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
TreeHugger Robot [Tue, 8 Nov 2016 11:56:39 +0000 (11:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 8 Nov 2016 04:22:16 +0000 (20:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6df5e8e050f06cb40a0a6b948361337427befc83
Auto-generated-cl: translation import
Fan Zhang [Mon, 7 Nov 2016 23:12:52 +0000 (15:12 -0800)]
Add Input & Gesture/Language & Region pages under System.
- Removed LanguageAndInputDashboardAlias because now the contents are
moved to new pages.
Bug:
32637613
Bug:
32643833
Test: RunSettingsRoboTests
Change-Id: Ia66a942a449a07b9cbba53bdc97738148aafadb4
Fan Zhang [Thu, 3 Nov 2016 20:29:06 +0000 (13:29 -0700)]
Refactor IMEAndLanguageSettings to use PreferenceController
Bug:
32642706
Bug:
32637613
Bug:
32643833
Test: RunSettingsRoboTests
This change is necessary to test preference controlling logic, as well
as making preferences reusable in other Preference pages in the new
information architecture.
Change-Id: I9e2fd2f6800579f005a5c303ed03ae06477006a6
Tony Mak [Mon, 7 Nov 2016 18:21:46 +0000 (18:21 +0000)]
Add policy transparency to "Remove work profile"
Bug:
32301173
Test: Manual test
Change-Id: Idcb75d2d40b8e7b59467e488d3e9837afe7c424a
Fan Zhang [Mon, 7 Nov 2016 18:18:40 +0000 (18:18 +0000)]
Merge "Remove logic of calling InputMethodAndSubtypeUtil."
jackqdyulei [Wed, 2 Nov 2016 03:01:11 +0000 (20:01 -0700)]
Remove hardcode color of sliding tab
Now use the color from textColorPrimary based on
current theme.
Bug:
32592245
Test: Visual
Change-Id: If6bbfe3b39ba30d96fc1f7d810472dc87006c3ea
Fan Zhang [Mon, 7 Nov 2016 17:15:50 +0000 (17:15 +0000)]
Merge "Remove dead code KeyboardLayoutPickerFragment."
Bill Yi [Sat, 5 Nov 2016 07:01:20 +0000 (07:01 +0000)]
Import translations. DO NOT MERGE am:
416fa38e75 -s ours
am:
d8bd462f71 -s ours
Change-Id: I4da2e8c39f7b47bdaa4d588b0a18298bb1097649
Bill Yi [Sat, 5 Nov 2016 06:44:39 +0000 (06:44 +0000)]
Import translations. DO NOT MERGE
am:
416fa38e75 -s ours
Change-Id: Idfc5c51e90e9ccfb84256f532250ca5cfdf2a0a1
Bill Yi [Sat, 5 Nov 2016 05:19:32 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I64f7cc447bbacc64f2993230946f87258496824a
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 5 Nov 2016 01:11:09 +0000 (01:11 +0000)]
Merge "Add Usb preference to connected devices dashboard."
Lei Yu [Fri, 4 Nov 2016 23:53:10 +0000 (23:53 +0000)]
Merge "update summary change no matter whether summary is equal"
Doris Ling [Thu, 3 Nov 2016 23:54:44 +0000 (16:54 -0700)]
Add Usb preference to connected devices dashboard.
Add Usb preference and the corresponding controller.
Change-Id: I79e3f20b5c024ece0515f9a6cba1185ba8b8c7be
Fixes:
31800290
Test: make RunSettingsRoboTests
Nathan Harold [Thu, 27 Oct 2016 20:45:00 +0000 (13:45 -0700)]
Add Ims Registration Info to RadioInfo
Bug:
32438227
Test: none
Change-Id: Iadb21a3108aaaa3afcde3972e6f98bfbbd5413f1
Fan Zhang [Fri, 4 Nov 2016 21:51:53 +0000 (14:51 -0700)]
Remove logic of calling InputMethodAndSubtypeUtil.
InputMethodAndLanguageSettings calls InputMethodAndSubtypeUtil for no
good reason. The page does not display or provide ways to change IMEs.
The virtualKeyboardFragment does, and it already contains logic for
refreshing InputMethodAndSubtypeUtil.
Bug:
32642706
Test: Compiles
Change-Id: Icdbf9cd2fa95ba3037c1e47d62c7514376cf8037
Fan Zhang [Fri, 4 Nov 2016 21:12:15 +0000 (14:12 -0700)]
Remove dead code KeyboardLayoutPickerFragment.
Bug:
32642706
Test: compiles
Change-Id: I02b7abed470a813bff13fe9d71fcf870a47de6b3
Nathan Harold [Fri, 28 Oct 2016 18:45:59 +0000 (11:45 -0700)]
Enable and Disable IMS Provisioning Based on Platform Capability
Bug: none
Test: none
Change-Id: I4be301864a3d48ef14834caa707e9d64536fd836
Stephen Chen [Fri, 4 Nov 2016 17:27:25 +0000 (17:27 +0000)]
Add subtypes to tron logging for Wifi toggles. am:
b21815e320
am:
4ba959c7c4 -s ours
Change-Id: I30245993416211bdccbb3068ba9bb68d5dedaa5e
Stephen Chen [Fri, 4 Nov 2016 17:22:30 +0000 (17:22 +0000)]
Add subtypes to tron logging for Wifi toggles.
am:
b21815e320
Change-Id: Ia08aa862e311dba4af08a1a76c0083519dcdeeb9
TreeHugger Robot [Fri, 4 Nov 2016 02:53:32 +0000 (02:53 +0000)]
Merge "More cleanup in input & language settings."
TreeHugger Robot [Thu, 3 Nov 2016 23:59:09 +0000 (23:59 +0000)]
Merge "Remove logic for select input method preference."
Fan Zhang [Thu, 3 Nov 2016 22:55:18 +0000 (15:55 -0700)]
More cleanup in input & language settings.
- Removed unused preferences that are commented out in pref xml.
- Also removed code that references to them in Fragment.
Bug:
32637613
Test: compile/manual
Change-Id: I84be24f9c5df7531843f03b047a93f9aa912432e
Fan Zhang [Thu, 3 Nov 2016 20:35:20 +0000 (13:35 -0700)]
Remove logic for select input method preference.
- The prefrence is not used in code according to comment, and it's not
defined in xml. So this chunk of code is redundant and should be
removed.
Bug:
32642706
Test: compiles, and manually navigate to fragment.
Change-Id: Iac38632d090c635f324bc4eed8e1c41300ddb08e
Stephen Chen [Mon, 31 Oct 2016 19:59:41 +0000 (12:59 -0700)]
Add subtypes to tron logging for Wifi toggles.
For ACTION_WIFI_CONNECT, added subtype to specify whether user is
connecting to saved network.
For ACTION_WIFI_OFF, added subtype to specify whether user was connected
to a network at the time.
Bug:
32371451
Test: Verify logs by running:
adb logcat -b events | egrep '(sysui_|notification_)'
Merged-In: I1d4445bda2fbeb062831e6f858ccc711bff65105
Change-Id: I6b87dc10fcfe412f1c72ae944c2dd4d81da12b53
TreeHugger Robot [Thu, 3 Nov 2016 19:26:46 +0000 (19:26 +0000)]
Merge "Add memory settings to developer setting."
Udam Saini [Thu, 3 Nov 2016 17:28:19 +0000 (17:28 +0000)]
Merge "Can launch into the lock screen with setup wizard style"
Fan Zhang [Wed, 2 Nov 2016 23:58:53 +0000 (16:58 -0700)]
Add memory settings to developer setting.
Bug:
32623105
Test: make RunSettingsRoboTests
Change-Id: I81e38b1ea4e59c330d0eef078af2751b3de739fe
jackqdyulei [Fri, 28 Oct 2016 20:23:10 +0000 (13:23 -0700)]
update summary change no matter whether summary is equal
Since the method parameter tile and tile in adpater is the same
instance, it is useless to check whether summary has changed.
Test: Run SettingsRoboTests
The function used in notifySummaryChanged already has testcases
in DashboardDataTest
Change-Id: I8c8969fcd2c89f368ca507808910fc7a9852f192
Lei Yu [Wed, 2 Nov 2016 23:21:35 +0000 (23:21 +0000)]
Merge "Show "uninstall for all users" when >1 users installed it."
TreeHugger Robot [Wed, 2 Nov 2016 23:06:02 +0000 (23:06 +0000)]
Merge "Add PrivacySettings to System category."
Fan Zhang [Wed, 2 Nov 2016 21:05:30 +0000 (21:05 +0000)]
Merge "Refactor bindPreferenceToTile to properly handle multi-user"
Jorim Jaggi [Wed, 2 Nov 2016 21:01:47 +0000 (21:01 +0000)]
Merge "Revert "The big keyguard transition refactor (1.1/n)""
Fan Zhang [Wed, 2 Nov 2016 16:15:33 +0000 (09:15 -0700)]
Add PrivacySettings to System category.
This activity is only activated when useDefaultBackup flag is set in
SettingsActivity
Bug:
31801428
Test: RunSettingsRoboTests
Change-Id: I7f5e968684dea623fb5604f944472accb89a0176
Jorim Jaggi [Wed, 2 Nov 2016 20:33:32 +0000 (20:33 +0000)]
Revert "The big keyguard transition refactor (1.1/n)"
This reverts commit
a3b50cc1baae57f97f29c995705c3918b44b9545.
Change-Id: I6db7d00d671556084d4903803c7d180ad7d091ca
Fixes:
32598209
Udam Saini [Tue, 1 Nov 2016 18:20:14 +0000 (11:20 -0700)]
Can launch into the lock screen with setup wizard style
The trampoline currently always uses the settings style for set action
new password. When called during setup wizard, it should launch the
setup wizard style.
Test: Added robotests for launching activity and copying setup wizard
extras. Also manually tested with an application when device is
provisioned and not provisioned.
bug:
32575389
Change-Id: I5763eb87b63a46b05cd200bb73b15bdc24c8bd3b
TreeHugger Robot [Wed, 2 Nov 2016 18:16:55 +0000 (18:16 +0000)]
Merge "Make Vpn.isAvailable return available, not unavailable"
Juan Flores [Wed, 2 Nov 2016 16:50:04 +0000 (16:50 +0000)]
Merge "Fix crash while searching in Settings" am:
176c0c5d98 am:
d705a333ca am:
16455893d7
am:
8510f57509
Change-Id: I58f746d72597db65456a4d09308c82a422fd318b
Juan Flores [Wed, 2 Nov 2016 16:47:33 +0000 (16:47 +0000)]
Merge "Fix crash while searching in Settings" am:
176c0c5d98 am:
d705a333ca
am:
16455893d7
Change-Id: Ic41c29b7d3ba2c90e4c375c843ea8532b236f4a4
Juan Flores [Wed, 2 Nov 2016 16:45:03 +0000 (16:45 +0000)]
Merge "Fix crash while searching in Settings" am:
176c0c5d98
am:
d705a333ca
Change-Id: I31732b822a80caa52cb97c43ea093dea8c0b19cb
Juan Flores [Wed, 2 Nov 2016 16:42:03 +0000 (16:42 +0000)]
Merge "Fix crash while searching in Settings"
am:
176c0c5d98
Change-Id: Iaaf4de39939728e9b2645e119437a9142473a5b1
Treehugger Robot [Wed, 2 Nov 2016 16:37:07 +0000 (16:37 +0000)]
Merge "Fix crash while searching in Settings"
Robin Lee [Wed, 2 Nov 2016 12:49:11 +0000 (12:49 +0000)]
Make Vpn.isAvailable return available, not unavailable
Also removed the check about secondary users. We already disable
adding a legacy VPN for secondary users inside the Settings page
itself.
We do not want to stop our users from configuring/disabling third
party VPNs, that's completely supported.
Bug:
23693383
Fix:
32308780
Test: manual, needs robotest
Change-Id: I99ab14b6b26582bdd7fc491c4b2542f3e653f3dc
Fan Zhang [Wed, 2 Nov 2016 15:56:09 +0000 (15:56 +0000)]
Merge "Clarify string and description for app defaults."
Jorim Jaggi [Wed, 2 Nov 2016 02:14:12 +0000 (02:14 +0000)]
Merge "The big keyguard transition refactor (1.1/n)"
Julia Reynolds [Wed, 2 Nov 2016 01:20:17 +0000 (01:20 +0000)]
Merge "Channel updates from users lock fields from interference."
Fan Zhang [Tue, 1 Nov 2016 22:29:01 +0000 (15:29 -0700)]
Clarify string and description for app defaults.
Change-Id: Idc93c89491696f6fae01c89a4649ca9f52169b7c
Fixes:
32393018
Test: compiles
TreeHugger Robot [Tue, 1 Nov 2016 21:58:03 +0000 (21:58 +0000)]
Merge "Add subtypes to tron logging for Wifi toggles."
Jorim Jaggi [Sun, 23 Oct 2016 21:55:26 +0000 (14:55 -0700)]
The big keyguard transition refactor (1.1/n)
Make sure to dismiss FALLBACK_HOME after we are fully unlocked, or
else AM will be waiting for the actual home to be visible before
unlocking.
Change-Id: I2f47ba1ff8f07e871be0d7187714aae5b81e9334