OSDN Git Service
Jeff Sharkey [Thu, 20 Apr 2017 13:15:28 +0000 (13:15 +0000)]
Merge "Flesh out more API docs." into oc-dev am:
3a427c3bd9
am:
750d6d12f6
Change-Id: I3778fa0ead9c23909875f88f7debba1f56c867a0
Jerry Zhang [Thu, 20 Apr 2017 13:11:48 +0000 (13:11 +0000)]
Merge "Only send HOST_STATE intents when host mode is used." into oc-dev am:
a73f9f874a
am:
bf51f836ae
Change-Id: Ie358c38f98d186ed0197248fcf82db2913cfe97d
Salvador Martinez [Thu, 20 Apr 2017 13:07:32 +0000 (13:07 +0000)]
Merge "Up the character limit for thermal strings" into oc-dev am:
95cdc61248
am:
cc1e8bce91
Change-Id: I46709c2743dfdb93c838dd86ab658eff35d451e4
Philipp Weiß [Thu, 20 Apr 2017 13:05:28 +0000 (13:05 +0000)]
Merge "Redesign QSSecurityFooter dialog"
TreeHugger Robot [Thu, 20 Apr 2017 13:02:17 +0000 (13:02 +0000)]
Merge "String fixes in QSFooter"
Jeff Hao [Thu, 20 Apr 2017 12:55:38 +0000 (12:55 +0000)]
Merge "Handle shared libraries for split apks." into oc-dev am:
e2c6cbbd72
am:
cb3d808e18
Change-Id: Id91e4f53f15b7c3899af6680880f86cb97a856ab
Eugene Susla [Thu, 20 Apr 2017 12:50:25 +0000 (12:50 +0000)]
Merge "Make javadoc of companion service name more like others" into oc-dev am:
4d95e40bb3
am:
aaa64afd83
Change-Id: Idbae279855b0851cf53fc1a7e17594a0590acbf3
Jeff Sharkey [Thu, 20 Apr 2017 12:46:37 +0000 (12:46 +0000)]
Merge "Some folks like sending null fields." into oc-dev am:
9a1967e157
am:
218c2135b6
Change-Id: I56fe999c3edb167aac57284700d3ccbbc5d4f9ea
Seigo Nonaka [Thu, 20 Apr 2017 12:42:11 +0000 (12:42 +0000)]
Merge "Add comment to Typeface.Builder about file descriptor." into oc-dev am:
f3157e1692
am:
39b5ad8411
Change-Id: Ia159ba2bff5cc333e6945d05291002ab8669c612
Matt Sarett [Thu, 20 Apr 2017 12:37:24 +0000 (12:37 +0000)]
Merge "Add unit test for Skia path behavior" into oc-dev am:
dc3ab163d3
am:
515222acd2
Change-Id: I214885c57e77ffd8a991478c96fb70582ce43e6c
TreeHugger Robot [Thu, 20 Apr 2017 12:05:46 +0000 (12:05 +0000)]
Merge "Add more explicit documentation for install reason"
phweiss [Wed, 19 Apr 2017 18:14:51 +0000 (20:14 +0200)]
Redesign QSSecurityFooter dialog
The dialog consists now of up to four sections: Device management,
CA certificates, Network Logging and VPN.
Also, small tweaks to the footer's coloring after the theme change of QS.
Bug:
34369166
Bug:
37492743
Test: in class QSSecurityFooterTest, which is part of "runtest systemui"
Change-Id: Ibf07a26fb6c5485a152f9d447f10c0f73acb94ba
TreeHugger Robot [Thu, 20 Apr 2017 07:48:42 +0000 (07:48 +0000)]
Merge "Handle runtime exception in clip data"
Daichi Hirono [Wed, 12 Apr 2017 05:23:06 +0000 (14:23 +0900)]
Handle runtime exception in clip data
When invoking ContentProvider through binder, ContentProvider may return
any type of RuntimeException. To let ClipData fall back to URI when it
failes to obtain text explanation, the CL add a catch closure for
RuntimeException.
Bug:
37260995
Test: Manually
Change-Id: I54ffbbcb05be3f3ff1ebc1c3dc68c074e6eb9825
TreeHugger Robot [Thu, 20 Apr 2017 04:22:09 +0000 (04:22 +0000)]
Merge "Apply Android code style to RefactoredBackupManagerService."
TreeHugger Robot [Thu, 20 Apr 2017 03:57:41 +0000 (03:57 +0000)]
Merge "Update layoutlib following Changes I7cf390d9 and I65e220ac"
Colin Cross [Thu, 20 Apr 2017 03:16:16 +0000 (03:16 +0000)]
Merge "Convert libinputservice to Android.bp"
Colin Cross [Thu, 20 Apr 2017 00:00:07 +0000 (17:00 -0700)]
Convert libinputservice to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: I3cd2bb05ec89c40ebd1240e352a19f99d00dc114
Evan Rosky [Thu, 20 Apr 2017 00:35:11 +0000 (00:35 +0000)]
Merge "Improve ViewDebug reporting for focus properties" into oc-dev am:
4ab21012a7
am:
a5f350fbb6
Change-Id: I70dde5b45f07d4af510e37073e22a9f3679715cc
Fan Zhang [Thu, 20 Apr 2017 00:33:26 +0000 (00:33 +0000)]
Merge "Force data usage bottom label to be LTR." into oc-dev am:
3a8d8db6ad
am:
a796215cb6
Change-Id: Icb843731ba6f7a9da19dd441366762927b9a7e22
Jason Monk [Thu, 20 Apr 2017 00:31:12 +0000 (00:31 +0000)]
Merge "Bring up the QS state colors to increase contrast" into oc-dev am:
214a8bdaee
am:
2253109ff8
Change-Id: I776d42072d206635ba6f5a609ab3662edce1954d
Abodunrinwa Toki [Thu, 20 Apr 2017 00:29:23 +0000 (00:29 +0000)]
Merge "TextClassifierImpl: Fix empty locale list issue." into oc-dev am:
ef0512a87a
am:
a98659942a
Change-Id: Id71eabec30d32c70301aa8f454a35ed97fe39a57
George Mount [Thu, 20 Apr 2017 00:25:56 +0000 (00:25 +0000)]
Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev am:
681ff5c7d8
am:
300a24c282
Change-Id: I29988d21eaaf1b1e49d8f90be921b77b5f3a368d
Wei Wang [Thu, 20 Apr 2017 00:23:42 +0000 (00:23 +0000)]
Merge "Add a wakelock timeout when downloading xtra data for GNSS." into oc-dev am:
b1f7358d98
am:
dca07572d9
Change-Id: I81e91999c4a289caceea2407f62ef417c4b71072
Mady Mellor [Thu, 20 Apr 2017 00:21:54 +0000 (00:21 +0000)]
Merge "Fix issue where the notification could snap to the menu while its invisible" into oc-dev am:
043ae355e9
am:
86df7a6574
Change-Id: I4047847af9801e4d8dd9db45be54772abc0fc8d7
Mady Mellor [Thu, 20 Apr 2017 00:19:58 +0000 (00:19 +0000)]
Merge "Update snooze visuals to match latest design" into oc-dev am:
c1d9cdfe79
am:
c69c1aafe2
Change-Id: Ie99c3f3aa3f7faf7d2ced99adca13c2788852b51
Zheng Zhang [Thu, 20 Apr 2017 00:16:18 +0000 (00:16 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am:
5b84ba3b15 -s ours am:
74b8c15d2b -s ours am:
9996f8589d -s ours
am:
89a7e998f1 -s ours
Change-Id: I4784b330048232799eb839cff00ca6e04dab5ecc
George Mount [Thu, 20 Apr 2017 00:10:42 +0000 (00:10 +0000)]
Merge "Merge "Adds getLayoutInflater() to return a cached value." into oc-dev am:
f3ff7b8207" into oc-dev-plus-aosp
am:
5c08716a58
Change-Id: I6ece7583fe6305f08eac7605d171b3d3779f3883
Winson Chung [Thu, 20 Apr 2017 00:08:29 +0000 (00:08 +0000)]
Merge "Merge "Adding consistent platform PiP action asset." into oc-dev am:
d1a1c8004e" into oc-dev-plus-aosp
am:
90ee48b66c
Change-Id: I0cac56ba0ce274e031826e2b3f4a2de72935f384
Evan Rosky [Thu, 20 Apr 2017 00:02:00 +0000 (00:02 +0000)]
Merge "Merge "Handle edge-case where no focusables exist" into oc-dev am:
f4c31bf67b" into oc-dev-plus-aosp
am:
a5abe8f1d1
Change-Id: Ic5dc4d9ddb8626196ea16638e431869f3fbb5536
Jason Monk [Wed, 19 Apr 2017 23:51:51 +0000 (23:51 +0000)]
Merge "Merge "Swap back content alphas for light and dark." into oc-dev am:
e262cc234b" into oc-dev-plus-aosp
am:
20a75de6a3
Change-Id: Ic130fd934bead375a55f0a760d21139efb8f6505
Yohei Yukawa [Wed, 19 Apr 2017 23:44:15 +0000 (23:44 +0000)]
Merge "Merge "Avoid acquiring a lock on the InputReader thread" into oc-dev am:
4132f86041" into oc-dev-plus-aosp
am:
2931c05a00
Change-Id: I2b621496be3d688ba547188ef4bd68f35fe5d1a8
Makoto Onuki [Wed, 19 Apr 2017 23:40:32 +0000 (23:40 +0000)]
Merge "Merge "Add missing services to incident_report" into oc-dev am:
f431ea56e1" into oc-dev-plus-aosp
am:
eef394369f
Change-Id: Iada6dbb1056d54fd5b68ba716532f10e0cebc462
Adam Lesinski [Wed, 19 Apr 2017 23:34:56 +0000 (23:34 +0000)]
Merge "Merge "Fix issue with fontScale changes not taking effect" into oc-dev am:
83c9413b75" into oc-dev-plus-aosp
am:
a79d516e63
Change-Id: Ib158c3a45ec89b7374418c064d7b46cc4ab8f551
Adam Lesinski [Wed, 19 Apr 2017 23:27:58 +0000 (23:27 +0000)]
Merge "Merge "AAPT: Auto-alias application adaptive-icon" into oc-dev am:
26e1d91939" into oc-dev-plus-aosp
am:
16e009466d
Change-Id: I215de04fec240441d20e22702b228d35b67811ea
Zheng Zhang [Wed, 19 Apr 2017 23:13:41 +0000 (23:13 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am:
5b84ba3b15 -s ours am:
74b8c15d2b -s ours am:
86c579678e -s ours" into oc-dev-plus-aosp
am:
3aee91cd80 -s ours
Change-Id: I534ea317ca49024558d24c7397658696fe57a0c3
Lucas Dupin [Wed, 19 Apr 2017 23:08:28 +0000 (23:08 +0000)]
Merge "Internal copy of Palette API." into oc-dev am:
8b4cca11f3
am:
5086a1d005
Change-Id: I4d297f8ec8c68f6c1b8994a2cc7f59b360476419
Sunny Goyal [Wed, 19 Apr 2017 23:01:03 +0000 (23:01 +0000)]
Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev am:
7790695bf2
am:
fa7cc65529
Change-Id: Ic916650a42614c88dca4050078bd854c3546288a
TreeHugger Robot [Wed, 19 Apr 2017 22:56:50 +0000 (22:56 +0000)]
Merge "Merge commit '
695d2c6df10c99cef25cfca584db9b0e164cdc9f' into manual_merge_695d2c6df10c"
TreeHugger Robot [Wed, 19 Apr 2017 22:53:12 +0000 (22:53 +0000)]
Merge "Add implementation alternatives for OemLockManager."
Rubin Xu [Wed, 19 Apr 2017 22:32:51 +0000 (22:32 +0000)]
Merge "Integrate weaver into authentication flow"
Rubin Xu [Fri, 31 Mar 2017 17:03:20 +0000 (18:03 +0100)]
Integrate weaver into authentication flow
Use the weaver applet running inside secure element to enforce
password verification back-off and provide secure deletion.
Bug:
30328567
Test: runtest frameworks-services -c com.android.server.WeaverBasedSyntheticPasswordTests
Test: manually on marlin/secure element with applet/secure element without applet
Change-Id: I376dd9707c90d005e56c85ee79a26fdc428779bf
TreeHugger Robot [Wed, 19 Apr 2017 22:18:52 +0000 (22:18 +0000)]
Merge "Opt out default focus highlight for TV."
TreeHugger Robot [Wed, 19 Apr 2017 21:52:02 +0000 (21:52 +0000)]
Merge "Pre-merge hide API for a11y service state"
Jeff Sharkey [Wed, 19 Apr 2017 21:22:10 +0000 (21:22 +0000)]
Merge "Flesh out more API docs." into oc-dev
am:
3a427c3bd9
Change-Id: I2031389cf3de22134af6ca48c0537e7ec3d150bc
Jerry Zhang [Wed, 19 Apr 2017 21:19:58 +0000 (21:19 +0000)]
Merge "Only send HOST_STATE intents when host mode is used." into oc-dev
am:
a73f9f874a
Change-Id: Idafd3b20e6780cc51dd18c327d8aeaa4247fa06f
Salvador Martinez [Wed, 19 Apr 2017 21:18:03 +0000 (21:18 +0000)]
Merge "Up the character limit for thermal strings" into oc-dev
am:
95cdc61248
Change-Id: Iee52d2a14946363c709a6b87907b264a7b28b349
Jeff Hao [Wed, 19 Apr 2017 21:14:03 +0000 (21:14 +0000)]
Merge "Handle shared libraries for split apks." into oc-dev
am:
e2c6cbbd72
Change-Id: I70e963fad3a4b21d85f898d676b8a6694afdb4c9
Robert Greenwalt [Wed, 19 Apr 2017 21:03:30 +0000 (14:03 -0700)]
Merge commit '
695d2c6df10c99cef25cfca584db9b0e164cdc9f' into manual_merge_695d2c6df10c
Change-Id: I768181b347ac5676f3535d94a26ca9e81178a110
Tomasz Wasilczyk [Wed, 19 Apr 2017 20:51:31 +0000 (20:51 +0000)]
Merge "Make RadioService actually talking to the HAL."
TreeHugger Robot [Wed, 19 Apr 2017 20:31:01 +0000 (20:31 +0000)]
Merge "Flesh out more API docs." into oc-dev
Jerry Zhang [Wed, 19 Apr 2017 20:28:03 +0000 (20:28 +0000)]
Merge "Only send HOST_STATE intents when host mode is used." into oc-dev
Eugene Susla [Wed, 19 Apr 2017 20:26:14 +0000 (20:26 +0000)]
Merge "Make javadoc of companion service name more like others" into oc-dev
am:
4d95e40bb3
Change-Id: I93645144f78139c95ca4e8b9bf61efcfb25296bf
TreeHugger Robot [Wed, 19 Apr 2017 20:25:37 +0000 (20:25 +0000)]
Merge "Update user id from shortcut constructor"
TreeHugger Robot [Wed, 19 Apr 2017 20:24:14 +0000 (20:24 +0000)]
Merge "Up the character limit for thermal strings" into oc-dev
Jeff Sharkey [Wed, 19 Apr 2017 20:19:28 +0000 (20:19 +0000)]
Merge "Some folks like sending null fields." into oc-dev
am:
9a1967e157
Change-Id: I90ea9660add142eb9286791134103f346f155add
Seigo Nonaka [Wed, 19 Apr 2017 20:17:00 +0000 (20:17 +0000)]
Merge "Add comment to Typeface.Builder about file descriptor." into oc-dev
am:
f3157e1692
Change-Id: I912f0a6b525c5f4ed111d0b6302915f57639dd9a
Jeff Hao [Wed, 19 Apr 2017 20:16:18 +0000 (20:16 +0000)]
Merge "Handle shared libraries for split apks." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 20:14:59 +0000 (20:14 +0000)]
Merge "Make javadoc of companion service name more like others" into oc-dev
Matt Sarett [Wed, 19 Apr 2017 20:12:28 +0000 (20:12 +0000)]
Merge "Add unit test for Skia path behavior" into oc-dev
am:
dc3ab163d3
Change-Id: I64831f6f383aa8149c8fb2cdc432702fa2fcc13e
Jeff Sharkey [Wed, 19 Apr 2017 20:11:23 +0000 (20:11 +0000)]
Merge "Some folks like sending null fields." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 20:08:53 +0000 (20:08 +0000)]
Merge "Add comment to Typeface.Builder about file descriptor." into oc-dev
Matt Sarett [Wed, 19 Apr 2017 20:03:49 +0000 (20:03 +0000)]
Merge "Add unit test for Skia path behavior" into oc-dev
Evan Rosky [Wed, 19 Apr 2017 19:56:38 +0000 (19:56 +0000)]
Merge "Improve ViewDebug reporting for focus properties" into oc-dev
am:
4ab21012a7
Change-Id: I8f5fa248a28b495c225d598eb9f5a98b8c5123f9
Fan Zhang [Wed, 19 Apr 2017 19:51:18 +0000 (19:51 +0000)]
Merge "Force data usage bottom label to be LTR." into oc-dev
am:
3a8d8db6ad
Change-Id: Ie8e37f05211172eb710ff737eebb3aba530a34d2
Evan Rosky [Wed, 19 Apr 2017 19:50:24 +0000 (19:50 +0000)]
Merge "Improve ViewDebug reporting for focus properties" into oc-dev
Jason Monk [Wed, 19 Apr 2017 19:49:08 +0000 (19:49 +0000)]
Merge "Bring up the QS state colors to increase contrast" into oc-dev
am:
214a8bdaee
Change-Id: Iea5e9c408fbcc74b176b5a33395bcbdebba121ee
TreeHugger Robot [Wed, 19 Apr 2017 19:43:53 +0000 (19:43 +0000)]
Merge "Force data usage bottom label to be LTR." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 19:43:02 +0000 (19:43 +0000)]
Merge "Bring up the QS state colors to increase contrast" into oc-dev
Fan Zhang [Tue, 18 Apr 2017 22:15:21 +0000 (15:15 -0700)]
Force data usage bottom label to be LTR.
The bottom label has to be LTR to be in sync with the main view above
it, which does not support RTL.
Change-Id: Ib5cccd1cccb249dad0badd36f4d491faf0bbb562
Fix:
37222561
Test: visual
Abodunrinwa Toki [Wed, 19 Apr 2017 19:25:10 +0000 (19:25 +0000)]
Merge "TextClassifierImpl: Fix empty locale list issue." into oc-dev
am:
ef0512a87a
Change-Id: Ibe0a7a52ab7122d720fc95f1dd6d8fe8d45c9a50
TreeHugger Robot [Wed, 19 Apr 2017 19:20:39 +0000 (19:20 +0000)]
Merge "TextClassifierImpl: Fix empty locale list issue." into oc-dev
George Mount [Wed, 19 Apr 2017 19:14:08 +0000 (19:14 +0000)]
Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev
am:
681ff5c7d8
Change-Id: I97976893f65b5f688f0319e5eaba5610bede73f4
Wei Wang [Wed, 19 Apr 2017 19:11:02 +0000 (19:11 +0000)]
Merge "Add a wakelock timeout when downloading xtra data for GNSS." into oc-dev
am:
b1f7358d98
Change-Id: I611cfae89e9d9e2be740cd8c130bf57bcf4cca11
TreeHugger Robot [Wed, 19 Apr 2017 19:06:04 +0000 (19:06 +0000)]
Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 19:00:54 +0000 (19:00 +0000)]
Merge "Add a wakelock timeout when downloading xtra data for GNSS." into oc-dev
Mady Mellor [Wed, 19 Apr 2017 19:00:49 +0000 (19:00 +0000)]
Merge "Fix issue where the notification could snap to the menu while its invisible" into oc-dev
am:
043ae355e9
Change-Id: I0f7d6ba47b6bacd2002a97b89b5c2bf5102ae9e7
Mady Mellor [Wed, 19 Apr 2017 18:58:59 +0000 (18:58 +0000)]
Merge "Update snooze visuals to match latest design" into oc-dev
am:
c1d9cdfe79
Change-Id: I1bb219553b05f87d4dce8ae2d43aa2fd80486bb1
Zheng Zhang [Wed, 19 Apr 2017 18:56:57 +0000 (18:56 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am:
5b84ba3b15 -s ours am:
74b8c15d2b -s ours
am:
9996f8589d -s ours
Change-Id: I743cd5c400a4c4a43938621349a6a7917d2deaaf
Android Build Merger (Role) [Wed, 19 Apr 2017 18:54:25 +0000 (18:54 +0000)]
Merge "Merge "Adds getLayoutInflater() to return a cached value." into oc-dev am:
f3ff7b8207" into oc-dev-plus-aosp
George Mount [Wed, 19 Apr 2017 18:53:02 +0000 (18:53 +0000)]
Merge "Adds getLayoutInflater() to return a cached value." into oc-dev
am:
f3ff7b8207
Change-Id: I447d517cba4f694896dc9319ba7b93dda4b1d01f
Android Build Merger (Role) [Wed, 19 Apr 2017 18:51:01 +0000 (18:51 +0000)]
Merge "Merge "Adding consistent platform PiP action asset." into oc-dev am:
d1a1c8004e" into oc-dev-plus-aosp
Winson Chung [Wed, 19 Apr 2017 18:50:11 +0000 (18:50 +0000)]
Merge "Adding consistent platform PiP action asset." into oc-dev
am:
d1a1c8004e
Change-Id: Ia94a684ca81bd50dd4cb51ebb816c4ac99f24a89
Android Build Merger (Role) [Wed, 19 Apr 2017 18:48:28 +0000 (18:48 +0000)]
Merge "Merge "Handle edge-case where no focusables exist" into oc-dev am:
f4c31bf67b" into oc-dev-plus-aosp
Evan Rosky [Wed, 19 Apr 2017 18:47:10 +0000 (18:47 +0000)]
Merge "Handle edge-case where no focusables exist" into oc-dev
am:
f4c31bf67b
Change-Id: I463f9cc2852cf085dc278fc080a583828d4311a9
Android Build Merger (Role) [Wed, 19 Apr 2017 18:45:29 +0000 (18:45 +0000)]
Merge "Merge "Swap back content alphas for light and dark." into oc-dev am:
e262cc234b" into oc-dev-plus-aosp
Jason Monk [Wed, 19 Apr 2017 18:44:48 +0000 (18:44 +0000)]
Merge "Swap back content alphas for light and dark." into oc-dev
am:
e262cc234b
Change-Id: I98a6e0ff1df55d3f6804869d40abe23aa2b7686e
Android Build Merger (Role) [Wed, 19 Apr 2017 18:44:19 +0000 (18:44 +0000)]
Merge "Merge "Avoid acquiring a lock on the InputReader thread" into oc-dev am:
4132f86041" into oc-dev-plus-aosp
Yohei Yukawa [Wed, 19 Apr 2017 18:43:37 +0000 (18:43 +0000)]
Merge "Avoid acquiring a lock on the InputReader thread" into oc-dev
am:
4132f86041
Change-Id: Ibb27f00525d08a45d41b8b345a4644be4ced2dbe
Android Build Merger (Role) [Wed, 19 Apr 2017 18:43:02 +0000 (18:43 +0000)]
Merge "Merge "Add missing services to incident_report" into oc-dev am:
f431ea56e1" into oc-dev-plus-aosp
TreeHugger Robot [Wed, 19 Apr 2017 18:42:31 +0000 (18:42 +0000)]
Merge "Fix issue where the notification could snap to the menu while its invisible" into oc-dev
Makoto Onuki [Wed, 19 Apr 2017 18:42:14 +0000 (18:42 +0000)]
Merge "Add missing services to incident_report" into oc-dev
am:
f431ea56e1
Change-Id: I87237a2a5108aae2e2402c74217ec5adc27306f1
TreeHugger Robot [Wed, 19 Apr 2017 18:41:44 +0000 (18:41 +0000)]
Merge "Update snooze visuals to match latest design" into oc-dev
Android Build Merger (Role) [Wed, 19 Apr 2017 18:41:46 +0000 (18:41 +0000)]
Merge "Merge "Fix issue with fontScale changes not taking effect" into oc-dev am:
83c9413b75" into oc-dev-plus-aosp
Adam Lesinski [Wed, 19 Apr 2017 18:41:00 +0000 (18:41 +0000)]
Merge "Fix issue with fontScale changes not taking effect" into oc-dev
am:
83c9413b75
Change-Id: I8afef55cae842c94c24c7cece1b8c5c90e6841c1
Android Build Merger (Role) [Wed, 19 Apr 2017 18:40:39 +0000 (18:40 +0000)]
Merge "Merge "AAPT: Auto-alias application adaptive-icon" into oc-dev am:
26e1d91939" into oc-dev-plus-aosp
Phil Weaver [Wed, 19 Apr 2017 18:40:32 +0000 (11:40 -0700)]
Update user id from shortcut constructor
No functional changes, because the value passed in happens to
be 0, but I noticed that I wasn't properly initializing stuff.
Test: Builds, boots, and I verified that the shortcut still works.
Change-Id: I712c5dc85c674628a66a5cfa9d4c3f7abbfa0129
Adam Lesinski [Wed, 19 Apr 2017 18:39:46 +0000 (18:39 +0000)]
Merge "AAPT: Auto-alias application adaptive-icon" into oc-dev
am:
26e1d91939
Change-Id: I1c2ddb6f4d88b30f04fa23caeb60799fbee255cf
Android Build Merger (Role) [Wed, 19 Apr 2017 18:39:25 +0000 (18:39 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am:
5b84ba3b15 -s ours am:
74b8c15d2b -s ours am:
86c579678e -s ours" into oc-dev-plus-aosp
Lucas Dupin [Wed, 19 Apr 2017 18:37:41 +0000 (18:37 +0000)]
Merge "Internal copy of Palette API." into oc-dev
am:
8b4cca11f3
Change-Id: Ie4ad73e57ca0b44d87986038874287ca6bab2f6d