OSDN Git Service
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 [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
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
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
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
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
Change-Id: I1d4445bda2fbeb062831e6f858ccc711bff65105
Fixes:
32371451
Test: Verify logs by running:
adb logcat -b events | egrep '(sysui_|notification_)'
Doris Ling [Tue, 1 Nov 2016 20:09:50 +0000 (20:09 +0000)]
Merge "Add Auto sync account data to account dashboard."
Fan Zhang [Tue, 1 Nov 2016 18:56:22 +0000 (11:56 -0700)]
Refactor bindPreferenceToTile to properly handle multi-user
Change-Id: I751eb645663b3546c212925e2ba4a0a94714013b
Fixes:
32470791
Test: RunSettingsRoboTests
Doris Ling [Tue, 1 Nov 2016 00:08:04 +0000 (17:08 -0700)]
Add Auto sync account data to account dashboard.
Add auto sync to User & accounts dashboard, and update
UserSettings to use the emergency info and add user when locked
controllers.
Test: RunSettingsRoboTests
Bug:
31801423
Change-Id: Ibf5a886276a9aa8f53c548036aecfd6c4d759ae3
Fan Zhang [Tue, 1 Nov 2016 17:28:30 +0000 (17:28 +0000)]
Fix crash when opening account sync detail for external app am:
c9cdc25f41 am:
f3e86ca481 am:
ce01f167e1
am:
1398c4b367
Change-Id: I18560c8269449a3cdcee0468c4b96364d3f1fb87
Fan Zhang [Tue, 1 Nov 2016 17:25:38 +0000 (17:25 +0000)]
Fix crash when opening account sync detail for external app am:
c9cdc25f41 am:
f3e86ca481
am:
ce01f167e1
Change-Id: I36a67f2241b1a4e2fc8787adb84af31209084ede
Fan Zhang [Tue, 1 Nov 2016 17:23:38 +0000 (17:23 +0000)]
Fix crash when opening account sync detail for external app am:
c9cdc25f41
am:
f3e86ca481
Change-Id: I3ca70edada88ee6d7c4dde2ba7e5972233357add
Fan Zhang [Tue, 1 Nov 2016 17:21:36 +0000 (17:21 +0000)]
Fix crash when opening account sync detail for external app
am:
c9cdc25f41
Change-Id: Ic8016695966d64c02c4e2fbe37703db8c771930e
TreeHugger Robot [Tue, 1 Nov 2016 08:06:34 +0000 (08:06 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 1 Nov 2016 06:29:35 +0000 (23:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I807a444483f1f320b29fc0880ae2b7b3d57d936a
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 1 Nov 2016 01:39:14 +0000 (01:39 +0000)]
Merge "Show select user dialog if setting tile supports multi-user"
Fan Zhang [Mon, 31 Oct 2016 20:17:13 +0000 (13:17 -0700)]
Show select user dialog if setting tile supports multi-user
Bug:
32470791
Test: RunSettingsRoboTests
Change-Id: I07a14c32a1b898467b03df09430038ac4a1a2aed
TreeHugger Robot [Mon, 31 Oct 2016 23:25:17 +0000 (23:25 +0000)]
Merge "Remove DashboardTilePreference."
Fan Zhang [Mon, 31 Oct 2016 19:45:49 +0000 (12:45 -0700)]
Fix crash when opening account sync detail for external app
Bug:
32426306
Test: Manual, and added unit test
Change-Id: I8703c9a13a60e57d7dd2bab2ae3cf6be362e351a
(cherry picked from commit
e3ad2b56c31f3f9fa751647197b8b2ca5cdb0fb6)
TreeHugger Robot [Mon, 31 Oct 2016 21:49:43 +0000 (21:49 +0000)]
Merge changes from topic '3p_app_account_sync_detail_crash'
* changes:
Add test for LocalClassLoaderContextThemeWrapper.
Fix crash when opening account sync detail for external app
Fan Zhang [Mon, 31 Oct 2016 21:40:15 +0000 (14:40 -0700)]
Remove DashboardTilePreference.
It's not needed for now.
Bug:
32554506
Test: RunSettingsRoboTests
Change-Id: I325a07896e88db97c9d3a461c8cb4c42a6c44737
Maurice Lam [Mon, 31 Oct 2016 20:30:25 +0000 (20:30 +0000)]
Merge "Clean up DatetimeSettingsSetupWizard"
Fan Zhang [Mon, 31 Oct 2016 19:59:36 +0000 (12:59 -0700)]
Add test for LocalClassLoaderContextThemeWrapper.
Bug:
32426306
Test: make RunSettingsRoboTests
Change-Id: I0b46f8ca69c50c86626bae717bac334b1bb7addf
Fan Zhang [Mon, 31 Oct 2016 19:45:49 +0000 (12:45 -0700)]
Fix crash when opening account sync detail for external app
Bug:
32426306
Test: Manual, and added unit test
Change-Id: I8703c9a13a60e57d7dd2bab2ae3cf6be362e351a
Julia Reynolds [Tue, 25 Oct 2016 13:16:53 +0000 (09:16 -0400)]
Channel updates from users lock fields from interference.
Also some apis have changed.
Test: manual, modify settings and check policy xml.
Change-Id: I967cb1fb30d8d400bdc0f3aa92fa07b4c87ddcf5
Nick Desaulniers [Sun, 30 Oct 2016 21:48:08 +0000 (14:48 -0700)]
DeviceInfoSettingsTest: test parsing llvm kernel
Adds unit test for DeviceInfoUtils.formatKernelVersion to see if it can
parse a /proc/version string from a kernel compiled with Clang/LLVM.
Bug:
32455817
Change-Id: I25123bf44f67e038e01d8c76d6eab18d5616c7c2
Fan Zhang [Sat, 29 Oct 2016 22:20:26 +0000 (15:20 -0700)]
Tweak UI for action buttons under app header.
- Make a transparent button with border style
Bug:
1584976
Test: manual
Change-Id: Ide53d71963afd4587834357999b40df81bb93500
TreeHugger Robot [Sat, 29 Oct 2016 02:00:40 +0000 (02:00 +0000)]
Merge "Use new app header in more screens."
Maurice Lam [Sat, 29 Oct 2016 00:57:23 +0000 (17:57 -0700)]
Clean up DatetimeSettingsSetupWizard
Test: Clean up. Existing tests pass
Bug:
32516406
Change-Id: Id7361f6eee26a30d179277c1d425b2f61a99d07d
Fan Zhang [Fri, 28 Oct 2016 18:17:04 +0000 (11:17 -0700)]
Use new app header in more screens.
- This covers app data usage settings, power usage details
- Addded helper method on AppHeaderController to build the header as
Preference because every fragment needs to do this anyway.
Bug:
32442716
Test: RunSettingsRoboTests
Change-Id: I6d38321b867154f8fb5194b993d118bcdbbfedc9
Doris Ling [Fri, 28 Oct 2016 23:32:42 +0000 (16:32 -0700)]
Fix test failure for EmergencyInfoTestController.
Make sure that the test preference has the correct key.
Change-Id: Icbf18d3f8854bc43ef486ae56f0b5fc8f035bf41
Fix:
32508237
Test: RunSettingsRoboTests
Fan Zhang [Fri, 28 Oct 2016 16:53:27 +0000 (09:53 -0700)]
Use new app header in more screens.
- This covers all subclasses of AppInfoWithHeader: app launch settings,
app storage settings, draw over settings, write setting details,
usage access settings.
Bug:
32442716
Test: RunSettingsRoboTests
Change-Id: I8e5831a4fcce5f98c3a6cc6b0fd66bc4a53d1330
Paul Stewart [Fri, 28 Oct 2016 21:20:19 +0000 (21:20 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address" am:
917b7b863c am:
27c5edb968 am:
dab924f04d
am:
09797c330c
Change-Id: I12cc021a1abead960ec28354e9d6e94ea8090c88
Paul Stewart [Fri, 28 Oct 2016 21:14:38 +0000 (21:14 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address" am:
917b7b863c am:
27c5edb968
am:
dab924f04d
Change-Id: I06bad134648c70f432194e163a8e0a5829f514f0
Paul Stewart [Fri, 28 Oct 2016 21:09:38 +0000 (21:09 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address" am:
917b7b863c
am:
27c5edb968
Change-Id: I427261d397f0003f1e4eecd55d431441303e4b4c
Paul Stewart [Fri, 28 Oct 2016 21:04:40 +0000 (21:04 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address"
am:
917b7b863c
Change-Id: I61b50ff7a50551e12a218d73bcf95f0c24e64430
Treehugger Robot [Fri, 28 Oct 2016 20:56:35 +0000 (20:56 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address"
TreeHugger Robot [Fri, 28 Oct 2016 20:25:34 +0000 (20:25 +0000)]
Merge "Add payload for condition card to reuse the viewholder"
TreeHugger Robot [Fri, 28 Oct 2016 20:25:29 +0000 (20:25 +0000)]
Merge "Temporary commenting out EmergencyInfoPreferenceControllerTest#handlePreferenceTreeClick_shouldStartActivity as it is failing a local checked build when trying to add Clockwork projects to "
jackqdyulei [Fri, 28 Oct 2016 18:11:21 +0000 (11:11 -0700)]
Add payload for condition card to reuse the viewholder
Bug:
30319913
Test: make RunSettingsRoboTests
Change-Id: Ib08a301203f4075f0553386f7db1a68d69bde436
Ariel Gertzenstein [Fri, 28 Oct 2016 18:23:11 +0000 (14:23 -0400)]
Temporary commenting out EmergencyInfoPreferenceControllerTest#handlePreferenceTreeClick_shouldStartActivity
as it is failing a local checked build when trying to add Clockwork projects to master.
Build command:
make -j64 PRODUCT-angler-userdebug dist DIST_DIR=out/dist checkbuild tests
Change-Id: I4f19c9d132a8c47a005ce40af74e7c9ebdba796d
Lei Yu [Fri, 28 Oct 2016 17:02:32 +0000 (17:02 +0000)]
Merge "Add scroll view for choose_lock_pattern in land mode"