OSDN Git Service
android-build-team Robot [Mon, 30 Apr 2018 23:44:27 +0000 (23:44 +0000)]
Merge "Fix NPE during unit test"
android-build-team Robot [Mon, 30 Apr 2018 22:40:05 +0000 (15:40 -0700)]
Merge "Fix fingerprint suggestion icon color." into pi-dev am:
6590f6948d
am:
92ad34d76a
Change-Id: I607af41645c8dd9ddf6209d741d19a78dff946e6
android-build-team Robot [Mon, 30 Apr 2018 22:30:20 +0000 (15:30 -0700)]
Merge "Fix fingerprint suggestion icon color." into pi-dev
am:
6590f6948d
Change-Id: Iacdf068f690d31c3e37a91e9cacb7a3810b4a9ef
android-build-team Robot [Mon, 30 Apr 2018 22:17:30 +0000 (22:17 +0000)]
Merge "Fix fingerprint suggestion icon color." into pi-dev
Fan Zhang [Mon, 30 Apr 2018 20:41:56 +0000 (13:41 -0700)]
Fix NPE during unit test
As of ag/
3932176 the slice indexer now queries getSummary() for each
controller. So we need to create all necessary objects before
getSummary(). In this case, the PSCD object.
Change-Id: I0162996be37d740f1e450880bf4698acd94ca0ad
Fixes:
78897071
Test: atest
android-build-team Robot [Mon, 30 Apr 2018 21:29:58 +0000 (14:29 -0700)]
Merge "Revert "Get rid of charging sounds toggle"" into pi-dev am:
8e55299f98
am:
72cedc72a4
Change-Id: Ib15d341f90072be2fbe3d6b5cb1bfd9c4fcbb938
android-build-team Robot [Mon, 30 Apr 2018 21:22:42 +0000 (14:22 -0700)]
Merge "Revert "Get rid of charging sounds toggle"" into pi-dev
am:
8e55299f98
Change-Id: I58e93b9c70d57224c01bd62fa47640badd1febaf
Doris Ling [Mon, 30 Apr 2018 21:08:55 +0000 (14:08 -0700)]
Fix fingerprint suggestion icon color.
- add tintable flag to the suggestion metadata so that it will be
displayed in correct tint color.
Change-Id: I29b6d3a8b7c47354d6022aea4d4f01986f5ce2b3
Fixes:
78655925
Test: visual
android-build-team Robot [Mon, 30 Apr 2018 21:08:51 +0000 (21:08 +0000)]
Merge "Revert "Get rid of charging sounds toggle"" into pi-dev
Fan Zhang [Mon, 30 Apr 2018 20:14:18 +0000 (13:14 -0700)]
Reset development tile values when turning off dev option.
Change-Id: Ib2e8ea3bfcffca5b2ee3d0ebd3c0c524239d2145
Fixes:
78654641
Test: robotest
Beverly Tai [Mon, 30 Apr 2018 20:01:40 +0000 (20:01 +0000)]
Revert "Get rid of charging sounds toggle"
Bug:
77912907
This reverts commit
fbe721b1b39d48ef8665267774b54f5f04b20d58.
Reason for revert: negative dogfood feedback
Change-Id: I8485a379eafee0a4fcd599e9b1c47aee7dd3c6ad
hjchangliao [Mon, 30 Apr 2018 03:42:56 +0000 (11:42 +0800)]
Update Conditional padding to align Suggestions
Reduce start/end padding of Conditional card,
to align Suggestions.
Change-Id: I333bfb848df27e7132d3e26953580de21ea235d3
Fixes:
78660126
Test: Manual test
android-build-team Robot [Sat, 28 Apr 2018 06:10:25 +0000 (06:10 +0000)]
Merge "Migrate ChooseAccountActivity to DashboardFragment"
Emily Chuang [Thu, 12 Apr 2018 02:12:28 +0000 (10:12 +0800)]
Migrate ChooseAccountActivity to DashboardFragment
- Build a controller to generate/manage a list of preferences.
- Move some logics to the controller and add tests.
- Rename to ChooseAccountFragment.
Bug:
73899467
Test: make RunSettingsRoboTests -j
atest UniquePreferenceTest SettingsGatewayTest
Change-Id: Id2906c4b922ef159d08c803b976671264c54665f
android-build-team Robot [Fri, 27 Apr 2018 22:58:25 +0000 (15:58 -0700)]
Merge "Updated play button icon for paused animations" into pi-dev am:
0929651a77
am:
022fcde73d
Change-Id: I8e2b631bf2699a88fe163b2fea5699c892f3f184
android-build-team Robot [Fri, 27 Apr 2018 22:54:21 +0000 (15:54 -0700)]
Merge "Updated play button icon for paused animations" into pi-dev
am:
0929651a77
Change-Id: I02c0842e2eb135e87a941b34a364341e9128924a
android-build-team Robot [Fri, 27 Apr 2018 22:47:29 +0000 (22:47 +0000)]
Merge "Updated play button icon for paused animations" into pi-dev
android-build-team Robot [Fri, 27 Apr 2018 21:26:18 +0000 (21:26 +0000)]
Merge "mark feature flag translateble to avoid loc bugs."
android-build-team Robot [Fri, 27 Apr 2018 17:13:13 +0000 (17:13 +0000)]
Merge "Remove the gear icon and change tapping event"
android-build-team Robot [Fri, 27 Apr 2018 17:03:36 +0000 (10:03 -0700)]
Merge "Add tint attribute to the icon" into pi-dev am:
98496a5683
am:
8e7b570142
Change-Id: Ic1ba08683aa90ca8289d38608dc8d398f0955689
android-build-team Robot [Fri, 27 Apr 2018 16:59:24 +0000 (09:59 -0700)]
Merge "Add tint attribute to the icon" into pi-dev
am:
98496a5683
Change-Id: Ic69e73f1847637cf7913e03696e6823840bbcb38
android-build-team Robot [Fri, 27 Apr 2018 16:55:06 +0000 (16:55 +0000)]
Merge "Add tint attribute to the icon" into pi-dev
android-build-team Robot [Fri, 27 Apr 2018 16:36:54 +0000 (16:36 +0000)]
Merge "Remove wrapper for LocationManager"
Julia Reynolds [Fri, 27 Apr 2018 12:53:03 +0000 (05:53 -0700)]
[automerger skipped] Merge "Redesign zen visual effects screens" into pi-dev am:
ea360d687d
am:
207d0bbe76 -s ours
Change-Id: I8550202afd948eb932ddc3373c9ce817f6e3f331
Julia Reynolds [Fri, 27 Apr 2018 12:48:26 +0000 (05:48 -0700)]
Merge "Redesign zen visual effects screens" into pi-dev
am:
ea360d687d
Change-Id: I416a1265f129825d91475ba63c30f02ec37adb52
Julia Reynolds [Fri, 27 Apr 2018 12:41:58 +0000 (12:41 +0000)]
Merge "Redesign zen visual effects screens" into pi-dev
Julia Reynolds [Mon, 23 Apr 2018 16:24:21 +0000 (12:24 -0400)]
Redesign zen visual effects screens
Test: robotests
Bug:
78448988
Change-Id: I3040c1103d76c75601e82e3660a2ace202837ec2
Merged-In: I3040c1103d76c75601e82e3660a2ace202837ec2
Julia Reynolds [Fri, 27 Apr 2018 11:08:57 +0000 (11:08 +0000)]
Merge "Redesign zen visual effects screens"
hughchen [Tue, 24 Apr 2018 07:46:30 +0000 (15:46 +0800)]
Remove the gear icon and change tapping event
* For fix the conflicts in pi-dev, cherry pick the ag/
3944480 in
master and merge the conflict.
* Remove the gear icon in "currently connected" section.
* Change the tapping event in "currently connected" section.
When tapping device in this section, take user to device detail page.
* Add test to verify when ConnectedBluetoothDeviceUpdater add preference
the shouldHideSecondTarget() is return true.
Bug:
78490845
Test: make -j40 RunSettingsRoboTests
Change-Id: I25f8455def3c38e24dea9af9e9e29ba37c250f67
TreeHugger Robot [Fri, 27 Apr 2018 03:57:57 +0000 (03:57 +0000)]
Merge "Fix crash in anomaly job service"
hjchangliao [Fri, 27 Apr 2018 03:27:46 +0000 (11:27 +0800)]
Remove wrapper for LocationManager
Remove LocationManagerWrapper from SettingsLib
Bug:
76167422
Test: RunSettingsRoboTests
Change-Id: I4ee5de7f6a59468e35ab0bfa2845022b7d7efb3a
Tony Huang [Fri, 27 Apr 2018 03:09:01 +0000 (20:09 -0700)]
Merge "Update StorageSummaryDonutPreference content" into pi-dev am:
070238df13
am:
3ba6c42ab0
Change-Id: Ibb80c748317948ab1b5b62f606c06375ee0c1cc9
Cyril Lee [Fri, 27 Apr 2018 03:08:01 +0000 (20:08 -0700)]
Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev am:
66640d6412
am:
7691959d04
Change-Id: I517a30099c8f28ddbc6ab04bf6a94a339505c9f3
Tony Huang [Fri, 27 Apr 2018 03:01:14 +0000 (20:01 -0700)]
Merge "Update StorageSummaryDonutPreference content" into pi-dev
am:
070238df13
Change-Id: If003dd4abdd28f07acc531c863b950eff69265ff
Cyril Lee [Fri, 27 Apr 2018 03:00:20 +0000 (20:00 -0700)]
Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev
am:
66640d6412
Change-Id: I781b47a12226b7ef93ee7bf6edcc43554e6a32bf
Tony Huang [Fri, 27 Apr 2018 02:58:15 +0000 (02:58 +0000)]
Merge "Update StorageSummaryDonutPreference content" into pi-dev
Cyril Lee [Fri, 27 Apr 2018 02:53:30 +0000 (02:53 +0000)]
Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev
Sam.SH Chang [Fri, 27 Apr 2018 02:28:00 +0000 (10:28 +0800)]
Add tint attribute to the icon
Bug:
78238313
Test: build pass
Change-Id: I805f5a8f1c21f617d3555e135e9d332b77ca0c29
Ivan Chiang [Fri, 27 Apr 2018 02:13:07 +0000 (19:13 -0700)]
Merge changes I3dd31855,Id5a75217 into pi-dev am:
720a224e00
am:
e598b1ae03
Change-Id: I715f7dba77f7ba10314ed4114b9eda1019171253
Ivan Chiang [Fri, 27 Apr 2018 02:06:38 +0000 (19:06 -0700)]
Merge changes I3dd31855,Id5a75217 into pi-dev
am:
720a224e00
Change-Id: Ibf611643afabea5ed181b0336da5e949d416e064
TreeHugger Robot [Fri, 27 Apr 2018 01:59:16 +0000 (01:59 +0000)]
Merge changes I3dd31855,Id5a75217 into pi-dev
* changes:
Show docks on previously connected devices page
Show Dock devices in Connected devices page
TreeHugger Robot [Fri, 27 Apr 2018 01:10:09 +0000 (01:10 +0000)]
Merge "Slices feature supports firmware version."
Phil Weaver [Fri, 27 Apr 2018 00:57:23 +0000 (17:57 -0700)]
Merge "Improve battery saver setting a11y semantics" into pi-dev am:
577f2af92b
am:
d7d1f98fa7
Change-Id: Ic79fa7da89397c517acd3087e23d652056296e89
Fan Zhang [Fri, 27 Apr 2018 00:35:24 +0000 (17:35 -0700)]
mark feature flag translateble to avoid loc bugs.
Change-Id: I8a5c1e5ce6afbcfb784524a15ad69966ea28b532
Fixes:
78503763
Test: builds
Phil Weaver [Fri, 27 Apr 2018 00:27:12 +0000 (17:27 -0700)]
Merge "Improve battery saver setting a11y semantics" into pi-dev
am:
577f2af92b
Change-Id: I223549eac9f7716ad514a3c0051018d97f7d9377
Phil Weaver [Thu, 26 Apr 2018 23:50:54 +0000 (23:50 +0000)]
Merge "Improve battery saver setting a11y semantics" into pi-dev
Fan Zhang [Thu, 26 Apr 2018 23:49:32 +0000 (16:49 -0700)]
Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev am:
62cd5f7f0f
am:
169d6a9cd6
Change-Id: Ie5aada5dc0993e097ad5215895bda86cebab2f87
Fan Zhang [Thu, 26 Apr 2018 23:40:23 +0000 (16:40 -0700)]
Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev
am:
62cd5f7f0f
Change-Id: I52220905e7a29dfc559c32ad6322a9681e390f83
Maurice Lam [Thu, 26 Apr 2018 23:30:58 +0000 (16:30 -0700)]
Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev am:
fd45210510
am:
160ffd6c4c
Change-Id: Ie21d2b916927cd200eaf1195647dd983ac7594c4
Maurice Lam [Thu, 26 Apr 2018 23:19:31 +0000 (16:19 -0700)]
Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev
am:
fd45210510
Change-Id: I959d3b3535d07168c6b0f6c9b9c043da93a6564c
Fan Zhang [Thu, 26 Apr 2018 23:12:14 +0000 (23:12 +0000)]
Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev
TreeHugger Robot [Thu, 26 Apr 2018 22:58:37 +0000 (22:58 +0000)]
Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev
Lei Yu [Thu, 26 Apr 2018 22:39:52 +0000 (15:39 -0700)]
Merge "Don't show high usage tip when device is charing" into pi-dev am:
3f34ce9a5b
am:
9de539ff0f
Change-Id: I661e0cecc068f56dbd3fa1a0de32a639432a79de
Lei Yu [Thu, 26 Apr 2018 22:39:01 +0000 (15:39 -0700)]
Merge "Hook up Adaptive Battery to new flag." into pi-dev am:
d2e9b56996
am:
59ba07c2da
Change-Id: I875f0264133f8358b4f85ccba18b672c0a05015f
Jason Monk [Thu, 26 Apr 2018 22:38:21 +0000 (15:38 -0700)]
Merge "Add auto-granting of slice permissions" into pi-dev am:
f778a91a88
am:
8ead7e26f2
Change-Id: I27cf09c0875b72d9e9478eed410884fa3813daf1
Jeff Sharkey [Thu, 26 Apr 2018 22:37:32 +0000 (15:37 -0700)]
Merge "Increase volume search timeout, fix dialog flow." into pi-dev am:
2e3aacaa7a
am:
3595870fa8
Change-Id: I6d5a007bc61c4e136f75c0462df4967e1861a92d
Lei Yu [Thu, 26 Apr 2018 22:27:26 +0000 (15:27 -0700)]
Merge "Don't show high usage tip when device is charing" into pi-dev
am:
3f34ce9a5b
Change-Id: Ie44032fb84bbe795c296b8b5fbd232c79d242612
Lei Yu [Thu, 26 Apr 2018 22:26:50 +0000 (15:26 -0700)]
Merge "Hook up Adaptive Battery to new flag." into pi-dev
am:
d2e9b56996
Change-Id: I643e48d47eba103ad24b26c0a425fd9c61b7aacf
Jason Monk [Thu, 26 Apr 2018 22:26:14 +0000 (15:26 -0700)]
Merge "Add auto-granting of slice permissions" into pi-dev
am:
f778a91a88
Change-Id: Ia4a1f22daca16324c23e401df8bc674ddc33e3d1
Jeff Sharkey [Thu, 26 Apr 2018 22:25:05 +0000 (15:25 -0700)]
Merge "Increase volume search timeout, fix dialog flow." into pi-dev
am:
2e3aacaa7a
Change-Id: If026407618907cbbb6ccd456e5fb9fcea5c13826
Lei Yu [Thu, 12 Apr 2018 23:44:45 +0000 (16:44 -0700)]
Fix crash in anomaly job service
If job has been stopped by any reason, we should cancel the background
thread, otherwise it will throw SecurityException when dequeuing from
JobParams.
This CL adds a lock to synchronize the method and stops dequeue work
if job has been canceled.
Change-Id: I7732b7f7d444a55a4b4ba6645cd2c16b6f840a6c
Merged-In: I7732b7f7d444a55a4b4ba6645cd2c16b6f840a6c
Fixes:
77968649
Test: RunSettingsRoboTests
tmfang [Mon, 23 Apr 2018 09:37:14 +0000 (17:37 +0800)]
Slices feature supports firmware version.
- Migrate FirmwareVersionPreferenceController to BasePreferenceController class.
- Because slices feature needs an unique uri,
we should avoid same firmware key in my_device_info.xml and device_info_settings.xml.
- Modify test case for new firmware version controller.
Test: slice uri > content://android.settings.slices/intent/my_device_firmware_version
Test: make RunSettingsRoboTests -j
atest UniquePreferenceTest SettingsGatewayTest
Change-Id: If516bbdb3ddb823db9909123ef694a2beaf5dc66
Lei Yu [Thu, 26 Apr 2018 22:08:55 +0000 (22:08 +0000)]
Merge "Don't show high usage tip when device is charing" into pi-dev
Lei Yu [Thu, 26 Apr 2018 22:07:53 +0000 (22:07 +0000)]
Merge "Hook up Adaptive Battery to new flag." into pi-dev
Jason Monk [Thu, 26 Apr 2018 22:05:19 +0000 (22:05 +0000)]
Merge "Add auto-granting of slice permissions" into pi-dev
sunnyshao [Tue, 24 Apr 2018 07:57:25 +0000 (15:57 +0800)]
Modified the AirplaneModePreferenceController for slice
- Updated the AirplaneModePreferenceController for slice feature
- Updated the AirplaneModeEnabler for slice feature
Fixes:
78645242
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.network
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard
atest UniquePreferenceTest SettingsGatewayTest
Change-Id: I4afbc666f916570d648ad2b33ebb25924024e9f1
Salvador Martinez [Thu, 26 Apr 2018 21:30:25 +0000 (14:30 -0700)]
Merge "Only start tether when not already enabled" into pi-dev am:
f62f91b0b6
am:
964d107491
Change-Id: I0d325498e2ea8526fbc4e6ec4bf579331bf0848b
TreeHugger Robot [Thu, 26 Apr 2018 21:28:16 +0000 (21:28 +0000)]
Merge "Increase volume search timeout, fix dialog flow." into pi-dev
Jason Monk [Thu, 26 Apr 2018 21:26:38 +0000 (14:26 -0700)]
Merge "Push full slice index to device index" into pi-dev am:
3d29ca2893
am:
2332aad2a6
Change-Id: I3563eb7ed2ab93b35b1a950d89ca2466abaa59e3
Salvador Martinez [Thu, 26 Apr 2018 21:15:25 +0000 (14:15 -0700)]
Merge "Only start tether when not already enabled" into pi-dev
am:
f62f91b0b6
Change-Id: If28a47b85fab06484298196305e862759998a72f
Jason Monk [Thu, 26 Apr 2018 21:08:36 +0000 (14:08 -0700)]
Merge "Push full slice index to device index" into pi-dev
am:
3d29ca2893
Change-Id: I51d4b2d8a271460215f0d489a372932fca5b3d8b
TreeHugger Robot [Thu, 26 Apr 2018 20:57:57 +0000 (20:57 +0000)]
Merge "Only start tether when not already enabled" into pi-dev
Jason Monk [Thu, 26 Apr 2018 20:48:41 +0000 (20:48 +0000)]
Merge "Push full slice index to device index" into pi-dev
Antony Sargent [Tue, 24 Apr 2018 16:57:44 +0000 (09:57 -0700)]
Updated play button icon for paused animations
The current play button is mostly white and hard to see with the new
animation videos. This updates it to one which has more blue to stand
out better.
Fixes:
78306799
Test: manual (while watching one of the animations at Settings -> System
-> Gestures; tap the video to pause)
Change-Id: I48deb6c35eccb3ecd21f2aa6dcc3d275c7436f47
Matthew Fritze [Thu, 26 Apr 2018 20:36:00 +0000 (13:36 -0700)]
Merge "Index database before getting Uri Descendants" into pi-dev am:
a7fd137e2d
am:
03f1fafaaf
Change-Id: I700fd063084ad0e41289feb552b3a1bfafd3cd57
Matthew Fritze [Thu, 26 Apr 2018 20:27:18 +0000 (13:27 -0700)]
Merge "Index database before getting Uri Descendants" into pi-dev
am:
a7fd137e2d
Change-Id: I88d50fd6157b9a62209e0afa1e6a791974a3c38b
Matthew Fritze [Thu, 26 Apr 2018 20:14:53 +0000 (20:14 +0000)]
Merge "Index database before getting Uri Descendants" into pi-dev
Fan Zhang [Thu, 26 Apr 2018 19:12:11 +0000 (19:12 +0000)]
Merge "InputMethodAndSubtypeEnabler use DashboardFragment"
Oscar Shu [Thu, 26 Apr 2018 18:40:09 +0000 (11:40 -0700)]
Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev am:
0b302499cd
am:
1635941c9a
Change-Id: Ic13938e0f4e876e3dfaea2049f2a7650b53fa8e1
Oscar Shu [Thu, 26 Apr 2018 18:25:15 +0000 (11:25 -0700)]
Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
am:
0b302499cd
Change-Id: I1cd33b35066d2dfa4b349dc163a2a16f7f0a123b
Oscar Shu [Thu, 26 Apr 2018 18:16:49 +0000 (18:16 +0000)]
Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
Julia Reynolds [Mon, 23 Apr 2018 16:24:21 +0000 (12:24 -0400)]
Redesign zen visual effects screens
Test: robotests
Bug:
78448988
Change-Id: I3040c1103d76c75601e82e3660a2ace202837ec2
Jan Nordqvist [Thu, 26 Apr 2018 17:53:03 +0000 (10:53 -0700)]
[automerger skipped] Merge "Hiding data remaining text when available space is too small." into pi-dev am:
5f6937dd88
am:
7b0651b63f -s ours
Change-Id: I51d36b9a8248a2c1047ddd6854d7c6675057c219
Jan Nordqvist [Thu, 26 Apr 2018 17:48:03 +0000 (10:48 -0700)]
Merge "Hiding data remaining text when available space is too small." into pi-dev
am:
5f6937dd88
Change-Id: I26b52aa76c4eab8e5240efae826debc74cb73e3e
TreeHugger Robot [Thu, 26 Apr 2018 17:33:53 +0000 (17:33 +0000)]
Merge "Hiding data remaining text when available space is too small." into pi-dev
Sean Callanan [Thu, 26 Apr 2018 17:20:45 +0000 (10:20 -0700)]
Merge "Settings: update color mode preview to final content" into pi-dev am:
9b08ed63e9
am:
7187243565
Change-Id: I49aefbb3c01760977e07535dc305921ceb548b6b
Salvador Martinez [Tue, 24 Apr 2018 23:03:34 +0000 (16:03 -0700)]
Only start tether when not already enabled
The toggle in the tether page currently tries to start tethering if
it gets turned on. However, changing a wifi config can cause
startTether to be called and also the toggle to switch leading to
a double call to startTether. This CL makes it so that if we are
already connected to tethering we don't try to start it again.
Test: robotests
Change-Id: I91085244c5d1fcc245a6b6480e638a32bc14f0ac
Fixes:
78028548
Fixes:
78441216
Fixes:
74368363
Sean Callanan [Thu, 26 Apr 2018 17:04:44 +0000 (10:04 -0700)]
Merge "Settings: update color mode preview to final content" into pi-dev
am:
9b08ed63e9
Change-Id: Ifd93423d8e22f5dc6f44e51db458c553007ffefd
Sean Callanan [Thu, 26 Apr 2018 16:39:51 +0000 (16:39 +0000)]
Merge "Settings: update color mode preview to final content" into pi-dev
Jason Monk [Fri, 20 Apr 2018 18:08:57 +0000 (14:08 -0400)]
Push full slice index to device index
Test: make RunSettingsRoboTests
Bug:
74555610
Change-Id: I3f0aa1218e1d7e736dc918d83e76423fa81ac6ab
Jason Monk [Thu, 26 Apr 2018 12:56:47 +0000 (05:56 -0700)]
Merge "Fix settings slice caching" into pi-dev am:
ab3aa6989a
am:
fa5e0ece68
Change-Id: Ia88dc12ead0cab4b335062cba4fbf7db8066e285
Jason Monk [Thu, 26 Apr 2018 12:50:45 +0000 (05:50 -0700)]
Merge "Fix settings slice caching" into pi-dev
am:
ab3aa6989a
Change-Id: I92edb44cecf7bede2b0c4494c6297c94e716d2f3
Jason Monk [Thu, 26 Apr 2018 12:46:20 +0000 (12:46 +0000)]
Merge "Fix settings slice caching" into pi-dev
Ivan Chiang [Wed, 18 Apr 2018 11:06:36 +0000 (19:06 +0800)]
Show docks on previously connected devices page
Implement previously connected Dock Devices part into
SavedDeviceGroupController.
Bug:
78095209
Test: m -j SettingsRoboTests RunSettingsRoboTests
Change-Id: I3dd318556167c98bc90c0c1c7281804177b9ff74
Ivan Chiang [Thu, 12 Apr 2018 10:21:51 +0000 (18:21 +0800)]
Show Dock devices in Connected devices page
Implement Connected Dock Devices part into
ConnectedDeviceGroupController.
Bug:
77945034
Test: m -j SettingsRoboTests RunSettingsRoboTests
Change-Id: Id5a75217f64d84038222604fca40613361e6f45d
Fan Zhang [Thu, 26 Apr 2018 04:35:54 +0000 (21:35 -0700)]
[automerger skipped] Merge "Use colorPrimary for search bar and suggestion background" into pi-dev am:
a6b773a3e1
am:
237260dfba -s ours
Change-Id: Icf0c5752f5bb7774383f1bbf591fc5e5284fbd0b
Fan Zhang [Thu, 26 Apr 2018 04:31:02 +0000 (21:31 -0700)]
Merge "Use colorPrimary for search bar and suggestion background" into pi-dev
am:
a6b773a3e1
Change-Id: I7780d9b56be0839df3ecd0b9ef74aff3ee29fdc1
TreeHugger Robot [Thu, 26 Apr 2018 04:27:30 +0000 (04:27 +0000)]
Merge "Use colorPrimary for search bar and suggestion background" into pi-dev
Maurice Lam [Thu, 26 Apr 2018 00:53:13 +0000 (17:53 -0700)]
Hide cancel button in Confirm Lock Pattern
Test: Manual
Bug:
77790615
Bug:
77565685
Change-Id: Ic3a12d169be037376f040dd1129678e814760091
Fan Zhang [Thu, 26 Apr 2018 02:50:46 +0000 (02:50 +0000)]
Merge "Implement LifecycleObserver in pulse notif controller."