OSDN Git Service
Bill Yi [Mon, 23 May 2016 15:49:19 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
fa65d11a21 -s ours
* commit '
fa65d11a21700634a52311190f40d5fd64535e8e':
Import translations. DO NOT MERGE
Change-Id: I16981cd6000b92784f640ac979c373a60c59e839
TreeHugger Robot [Mon, 23 May 2016 15:35:52 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 23 May 2016 13:21:44 +0000 (06:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6a67ee6c7f1c034eaea3885f13884f6c7add477d
Auto-generated-cl: translation import
Victor Chang [Mon, 23 May 2016 11:58:41 +0000 (11:58 +0000)]
Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev
am:
d86ac8116b
* commit '
d86ac8116bfc64c61d8124ff8d3e92be5e55cd3e':
New api in LockSettingsService to get StrongAuth synchronously
Change-Id: I3fe13c51d5d33f5689f0b4130a33cf3a2777e186
Victor Chang [Mon, 23 May 2016 11:51:54 +0000 (11:51 +0000)]
Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev
Lorenzo Colitti [Mon, 23 May 2016 09:10:55 +0000 (09:10 +0000)]
Merge "Only actually log the DNS events we have." into nyc-dev
am:
cb98809657
* commit '
cb988096570de8af4883ae3bdea06c88f8fd235a':
Only actually log the DNS events we have.
Change-Id: I6fa83369e45fbf0a33c0519cc47e5d3f21321463
TreeHugger Robot [Mon, 23 May 2016 09:01:44 +0000 (09:01 +0000)]
Merge "Only actually log the DNS events we have." into nyc-dev
Lorenzo Colitti [Mon, 23 May 2016 05:10:19 +0000 (14:10 +0900)]
Only actually log the DNS events we have.
DnsEventListenerService#logAndClear was always logging 100 DNS
events regardless of how many were actually logged. The rest of
the events were either all zero or previously-recorded events.
Bug:
28204408
Change-Id: I9da3b07a2e7b7512397a3eb6568a877815eb3312
Chad Brubaker [Mon, 23 May 2016 02:32:19 +0000 (02:32 +0000)]
Merge "Use an attribute for the network security config resource" into nyc-dev
am:
6812bdf387
* commit '
6812bdf38797101d3744befe70f3501b75f01ce6':
Use an attribute for the network security config resource
Change-Id: I2236b69a2af2258e7600a4833fe7be95f64e6260
TreeHugger Robot [Mon, 23 May 2016 02:23:25 +0000 (02:23 +0000)]
Merge "Use an attribute for the network security config resource" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:34:39 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
917ead578b -s ours
* commit '
917ead578baa6fba7e8e45756c67c879bb912364':
Import translations. DO NOT MERGE
Change-Id: I5359b0ee4ae342ed910fa7b888f1dcd621c4fd35
Baligh Uddin [Sun, 22 May 2016 23:34:36 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
7533f3260e -s ours
* commit '
7533f3260e888c6edc709b02eafdb5722172ecc2':
Import translations. DO NOT MERGE
Change-Id: I1eeeb4510ca635af93a97af9950dc2b54914199b
Baligh Uddin [Sun, 22 May 2016 23:34:33 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
41a1d11f98 -s ours
* commit '
41a1d11f98d170ed41935d35fc1a3ed4af2c59fd':
Import translations. DO NOT MERGE
Change-Id: I2e0d39f64f0ebd738cad7d7676eb809f1fe88db7
Baligh Uddin [Sun, 22 May 2016 23:34:29 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
83378cb136 -s ours
* commit '
83378cb13689fa73be349a9ce4b0802ed64fc935':
Import translations. DO NOT MERGE
Change-Id: Id406199ec77f14e947db6f7c65a2f3b65795374d
Baligh Uddin [Sun, 22 May 2016 23:32:35 +0000 (23:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
23b665d65c -s ours
* commit '
23b665d65cd06c38a3ffb8301f4b47ca00eaa5a3':
Import translations. DO NOT MERGE
Change-Id: Ie2e6a2515d39cd5284946abba39f9800d020d32b
Baligh Uddin [Sun, 22 May 2016 23:32:29 +0000 (23:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
97360f90ce -s ours
* commit '
97360f90ce2015f56b860692dabe0aa82786a888':
Import translations. DO NOT MERGE
Change-Id: Iae715670385932f22208abd984b7add31c1a0084
Baligh Uddin [Sun, 22 May 2016 23:32:22 +0000 (23:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
a4bfd03cd5 -s ours
* commit '
a4bfd03cd53aeac1c608fde7faa1f2c5a043a6ce':
Import translations. DO NOT MERGE
Change-Id: I2bba6312b1aa23a3768fb2a72529ac0d9351cb12
Baligh Uddin [Sun, 22 May 2016 23:32:15 +0000 (23:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
83a23d290d -s ours
* commit '
83a23d290da639131c610521c729f851d13c7112':
Import translations. DO NOT MERGE
Change-Id: I04d8d0b14886a09c5acb42567b038173af84cc76
Baligh Uddin [Sun, 22 May 2016 23:32:06 +0000 (23:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
71c4e0b44a -s ours
* commit '
71c4e0b44acbf60c396de4984ddc498163c708e1':
Import translations. DO NOT MERGE
Change-Id: Ic16aa366bbacc24faa14223f5840b2847ff5e1dd
Baligh Uddin [Sun, 22 May 2016 23:27:08 +0000 (23:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
24708d9c8e -s ours
* commit '
24708d9c8e54701d6c3ee20f72e8dfb09d0f5c75':
Import translations. DO NOT MERGE
Change-Id: I1f93f0ce7bdbf80b0c13fbd3678c08675e7396e8
Baligh Uddin [Sun, 22 May 2016 23:26:36 +0000 (23:26 +0000)]
Import translations. DO NOT MERGE
am:
cd669b648a -s ours
* commit '
cd669b648a94a14d32ce942a5004b73784dcad3c':
Import translations. DO NOT MERGE
Change-Id: Ibb9c31f010802d141ec383d3a49100a570f29ec4
Baligh Uddin [Sun, 22 May 2016 23:22:28 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:22:16 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:47 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:43 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:38 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:36 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:33 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:31 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:29 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:12:31 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 02:12:53 +0000 (19:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: If505e78ba6d78210fb4eba0ac8a57df26e860d03
Baligh Uddin [Sun, 22 May 2016 02:10:02 +0000 (19:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: Ic64c474ffea820c8d329796bc6f84bb7b2704c2d
Baligh Uddin [Sun, 22 May 2016 01:43:19 +0000 (18:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: Ia00d58694c7f42c901f10a3bd93bb6b3b2725400
Baligh Uddin [Sun, 22 May 2016 01:40:26 +0000 (18:40 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I6d6dc4604209ca11ed6b05c582ee8c30705cd5b3
Baligh Uddin [Sun, 22 May 2016 01:32:50 +0000 (18:32 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I65276399d18300cfa46f8912ae1269b1655c7a2a
Baligh Uddin [Sun, 22 May 2016 01:24:43 +0000 (18:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I2e883f6dd637c5cbd3bf17bb6f73946f8793fd44
Baligh Uddin [Sun, 22 May 2016 01:16:25 +0000 (18:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I99304991a57f64a31b07ca2ca85cf47e348d41c9
Baligh Uddin [Sun, 22 May 2016 01:13:37 +0000 (18:13 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I52cdbac273fbf9e3d30d67e82b539e469aed3b31
Baligh Uddin [Sun, 22 May 2016 01:10:37 +0000 (18:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I57faba063381c76c11ea7530bef7ca455d9da4d5
Baligh Uddin [Sat, 21 May 2016 19:46:09 +0000 (12:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I3e66f964402487321dd1923656d488b514bc68ba
Baligh Uddin [Sat, 21 May 2016 19:39:28 +0000 (12:39 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: If486d4168089e018bea1f2acbdbccb2846ee9250
Hemal Patel [Sat, 21 May 2016 01:07:24 +0000 (01:07 +0000)]
Merge "Docs: Fixed a typo" into mnc-io-docs am:
31707f0185 am:
7f21500b1c
am:
46861a0abc
* commit '
46861a0abc9919bbbeac1cd0bd6449d3549ac349':
Docs: Fixed a typo
Change-Id: I07c642764f29881830068fe1b1e19b0d31dd124b
Hemal Patel [Sat, 21 May 2016 01:02:58 +0000 (01:02 +0000)]
Merge "Docs: Fixed a typo" into mnc-io-docs am:
31707f0185
am:
7f21500b1c
* commit '
7f21500b1c8fbd38fadb0bf10504b2c5fba9d7fa':
Docs: Fixed a typo
Change-Id: I115b647df4e3489e6fd47222b621f8b9c7cdfdf3
Chong Zhang [Sat, 21 May 2016 00:58:16 +0000 (00:58 +0000)]
Merge "Dispose HideNavInputEventReceiver on PhoneWindowManager\'s handler" into nyc-dev
am:
1f170ddef8
* commit '
1f170ddef81ee242dcdf8dc6b9aa60876cf3bff8':
Dispose HideNavInputEventReceiver on PhoneWindowManager's handler
Change-Id: I5fa21095433060775f9e995a5bdfa4184ad85f88
Hemal Patel [Sat, 21 May 2016 00:58:14 +0000 (00:58 +0000)]
Merge "Docs: Fixed a typo" into mnc-io-docs
am:
31707f0185
* commit '
31707f01851ab18ab7b60d8cd8a825b07e83e840':
Docs: Fixed a typo
Change-Id: Icdd5d354cedea96a70d74c0e63604e1c69eae370
Hemal Patel [Sat, 21 May 2016 00:49:46 +0000 (00:49 +0000)]
Merge "Docs: Fixed a typo" into mnc-io-docs
Chong Zhang [Sat, 21 May 2016 00:49:36 +0000 (00:49 +0000)]
Merge "Dispose HideNavInputEventReceiver on PhoneWindowManager's handler" into nyc-dev
Chong Zhang [Sat, 21 May 2016 00:03:08 +0000 (17:03 -0700)]
Dispose HideNavInputEventReceiver on PhoneWindowManager's handler
Disposal of input event receiver needs to happen on the handler
specified for receiving the inputs, otherwise nativeFinishInputEvent
could crash due to race with native dispose.
Instead of disposing mInputConsumer in beginLayoutLw(), post to
PhoneWindowManager's handler to dispose, and skip any input events
received after mInputConsumer is set to null by beginLayoutLw().
bug:
26927018
Change-Id: I094eb4472ea68f2c8bd6a428161d7edb11dc8900
Adam Lesinski [Sat, 21 May 2016 00:13:37 +0000 (00:13 +0000)]
Merge "Performance improvements in AssetManager" into nyc-dev
am:
3765d34d36
* commit '
3765d34d364e76817e9dbea55819df86d858df10':
Performance improvements in AssetManager
Change-Id: Id552f8bc9753f2d336ab2e9cf1f05d5e5b2a2409
Adam Lesinski [Sat, 21 May 2016 00:07:00 +0000 (00:07 +0000)]
Merge "Performance improvements in AssetManager" into nyc-dev
Robert Carr [Fri, 20 May 2016 23:01:03 +0000 (23:01 +0000)]
Merge "Correctly clear resizing drawable when nulling background." into nyc-dev
am:
a3ec065a43
* commit '
a3ec065a43069a19dc42f023a40d54a3178f1b44':
Correctly clear resizing drawable when nulling background.
Change-Id: I9cbb109bbd7891c30711a68bf88d8b2c4332baa3
Brad Ebinger [Fri, 20 May 2016 23:00:58 +0000 (23:00 +0000)]
Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev
am:
ecab20d852
* commit '
ecab20d852826286e4d9d8c095ef61cebbb0ab4e':
Add check for Vibration RingerMode in VibratorService
Change-Id: Iaab0a9006897ba57e25be58723c96f2bc214df71
TreeHugger Robot [Fri, 20 May 2016 22:56:46 +0000 (22:56 +0000)]
Merge "Correctly clear resizing drawable when nulling background." into nyc-dev
Brad Ebinger [Fri, 20 May 2016 22:53:26 +0000 (22:53 +0000)]
Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev
Adrian Roos [Fri, 20 May 2016 22:17:10 +0000 (22:17 +0000)]
Merge "Fix cut off actions in messaging style" into nyc-dev
am:
cbfef08990
* commit '
cbfef08990e4d44c723da71f7f7271a72fb10f17':
Fix cut off actions in messaging style
Change-Id: I732a67af98e2ee083ef004e3266e6662b85308ad
Adrian Roos [Fri, 20 May 2016 22:08:35 +0000 (22:08 +0000)]
Merge "Fix cut off actions in messaging style" into nyc-dev
Adam Lesinski [Fri, 20 May 2016 01:25:28 +0000 (18:25 -0700)]
Performance improvements in AssetManager
Change the implementation of getLocales() to iterate the set of
configurations using a templated method, instead of using the result
of getConfigurations().
Also remove the check for AndroidManifest.xml when adding an asset path.
This is unneccessary.
Bug:
28625993
Change-Id: I16de5da598d0c371421d1dc8eee054dce9baf53a
Jae Seo [Fri, 20 May 2016 21:02:11 +0000 (21:02 +0000)]
Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev
am:
44fbbfd248
* commit '
44fbbfd24857ad0defcaa0ef85c0d5b01cd2250a':
MediaBrowserService: Add more explanation on getBrowserRootHints()
Change-Id: I0cc37df958a3419770cc943a077f35bd3c41a324
Jae Seo [Fri, 20 May 2016 20:53:01 +0000 (20:53 +0000)]
Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev
Brad Ebinger [Fri, 13 May 2016 01:05:17 +0000 (18:05 -0700)]
Add check for Vibration RingerMode in VibratorService
Add a check for whether or not the Phone is in the Vibrate RingerMode
when deciding whether or not to vibrate for an incoming call.
Bug:
28569078
Change-Id: Ib2e6243fd0b18c5426b5572c0806d67111a80a57
Jason Monk [Fri, 20 May 2016 19:52:59 +0000 (19:52 +0000)]
Merge "QS: Fix RTL animation" into nyc-dev
am:
d1df86dbb8
* commit '
d1df86dbb8a86c607d7fc1e0a89c7a10fe9899fa':
QS: Fix RTL animation
Change-Id: Id61eb8c61845ab5a7edbcd20444cc0df4a5074c8
Seigo Nonaka [Fri, 20 May 2016 19:52:55 +0000 (19:52 +0000)]
Merge "Clear locales without changing layout direction." into nyc-dev
am:
6686711ba2
* commit '
6686711ba289740a20dc15133aed4a2b5bac5d44':
Clear locales without changing layout direction.
Change-Id: Ifa6124e9b772b54355b696aa4df1ca94950c64c5
Jason Monk [Fri, 20 May 2016 19:42:39 +0000 (19:42 +0000)]
Merge "QS: Fix RTL animation" into nyc-dev
Roozbeh Pournader [Fri, 20 May 2016 19:42:30 +0000 (19:42 +0000)]
Merge "Clear locales without changing layout direction." into nyc-dev
Vincent Palatin [Fri, 20 May 2016 18:44:42 +0000 (18:44 +0000)]
Merge "Fix notifications for USB PD enabled devices" into nyc-dev
am:
73722c4b0c
* commit '
73722c4b0cdd3aea12f67b3822244dc3b4aa4387':
Fix notifications for USB PD enabled devices
Change-Id: I77b56a1811cc3b7580bfe3ebae295c05b0b6918e
Jason Monk [Fri, 20 May 2016 18:44:16 +0000 (14:44 -0400)]
QS: Fix RTL animation
Change-Id: I9de6e0891fa98ec2212abe28fa942779aa224056
Fixes:
28674500
TreeHugger Robot [Fri, 20 May 2016 18:32:09 +0000 (18:32 +0000)]
Merge "Fix notifications for USB PD enabled devices" into nyc-dev
Seigo Nonaka [Fri, 13 May 2016 06:11:37 +0000 (15:11 +0900)]
Clear locales without changing layout direction.
Calling Configuration.setLocales with emtpy LocaleList may change the
layout direction to LTR. To clear the locales in Configuration without
layout direction change, introduce hidden API to Configuration.
Bug:
28695661
Change-Id: I47c339dffb83099bd329ddb60237dab27b05f593
Siyamed Sinir [Fri, 20 May 2016 17:53:50 +0000 (17:53 +0000)]
Merge "setTransformationMethod should reset mTextDir" into nyc-dev
am:
df9dee869c
* commit '
df9dee869c9efa18619b28691c88415b4f115df7':
setTransformationMethod should reset mTextDir
Change-Id: I47699dc6e8c8fdddd91db2c4590a5244403c5f5c
Siyamed Sinir [Fri, 20 May 2016 17:46:26 +0000 (17:46 +0000)]
Merge "setTransformationMethod should reset mTextDir" into nyc-dev
Paul Stewart [Fri, 20 May 2016 17:45:21 +0000 (17:45 +0000)]
Merge "Don\'t remove existing EAP configurations" into nyc-dev
am:
c7ad1ac712
* commit '
c7ad1ac712f09c5bc116c66a54a860000b53fa38':
Don't remove existing EAP configurations
Change-Id: I2678831ad384368a322af859aeadc42fcd2aeda7
Paul Stewart [Fri, 20 May 2016 17:39:43 +0000 (17:39 +0000)]
Merge "Don't remove existing EAP configurations" into nyc-dev
Adam Lesinski [Fri, 20 May 2016 17:32:42 +0000 (17:32 +0000)]
Merge "Fix parsing of kernel wakelocks" into nyc-dev
am:
6f0d399214
* commit '
6f0d3992149aa782450667ed750fe0c3cf8ee334':
Fix parsing of kernel wakelocks
Change-Id: Ibc60849809b5553e820833437a9d2d47d065a38e
Wale Ogunwale [Fri, 20 May 2016 17:24:15 +0000 (17:24 +0000)]
Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev
am:
a781232656
* commit '
a78123265658380b3968773a5f575b0ba1b4620e':
Put launch adjacent activity in a new task if the activity does exist
Change-Id: I3f08450d7cbb248467ba34e3a28c2b1225b92d31
Adam Lesinski [Fri, 20 May 2016 17:23:07 +0000 (17:23 +0000)]
Merge "Fix parsing of kernel wakelocks" into nyc-dev
TreeHugger Robot [Fri, 20 May 2016 17:15:58 +0000 (17:15 +0000)]
Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev
Christopher Tate [Fri, 20 May 2016 17:11:07 +0000 (17:11 +0000)]
Merge "Back up / restore the \'mono audio\' setting" into nyc-dev
am:
a3aaa5ee25
* commit '
a3aaa5ee2558ac5a6b6ca0b309dc9eea4c51bf14':
Back up / restore the 'mono audio' setting
Change-Id: Ie20918c1a8306342de7a5e2201d3e55fff39500c
Chris Tate [Fri, 20 May 2016 17:05:37 +0000 (17:05 +0000)]
Merge "Back up / restore the 'mono audio' setting" into nyc-dev
Jason Monk [Fri, 20 May 2016 17:00:39 +0000 (17:00 +0000)]
Merge "Nav bar: fix tablet density change issues" into nyc-dev
am:
6c2bc3db95
* commit '
6c2bc3db95dde4e4dff9d04266c3b87c8a6af306':
Nav bar: fix tablet density change issues
Change-Id: I1a78b8cc86c3fef24cdddbd07c0dfafb61bca471
Winson [Fri, 20 May 2016 16:53:03 +0000 (16:53 +0000)]
Only broadcast screenshot error to the current user.
am:
538c22630b
* commit '
538c22630b3ffd3c9efd544552d5a7fb3ae876a8':
Only broadcast screenshot error to the current user.
Change-Id: I0a0f1e04f9cc4bfcca3a9d1c93afad44759c6476
TreeHugger Robot [Fri, 20 May 2016 16:52:19 +0000 (16:52 +0000)]
Merge "Nav bar: fix tablet density change issues" into nyc-dev
Winson [Thu, 19 May 2016 17:06:18 +0000 (10:06 -0700)]
Only broadcast screenshot error to the current user.
Bug:
28807226
Change-Id: I428ecc5572d7522580cdf38bded2fff9cf07abc2
Chris Wren [Fri, 20 May 2016 16:12:00 +0000 (16:12 +0000)]
Merge "rate limit notification enqueues" into nyc-dev
am:
585ff8bd12
* commit '
585ff8bd126ffac98164a87d24a9add5c23f9597':
rate limit notification enqueues
Change-Id: I844cb3d587ed5b5808a3adcbb362c2716123c043
TreeHugger Robot [Fri, 20 May 2016 16:04:48 +0000 (16:04 +0000)]
Merge "rate limit notification enqueues" into nyc-dev
Wale Ogunwale [Fri, 20 May 2016 15:50:15 +0000 (08:50 -0700)]
Put launch adjacent activity in a new task if the activity does exist
For the launch adjacent case we only want to put the activity in
an existing task if the activity already exists in the history.
Bug:
28828326
Change-Id: I1a6fdd6779cb20f8c0d9b7d94635b21718f4ac1b
Tony Mak [Fri, 20 May 2016 15:46:19 +0000 (15:46 +0000)]
Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review
am:
53b5df43b4
* commit '
53b5df43b49b191e442c4d2c7b9a9cba3ebdcf92':
Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review
Change-Id: I92a8e1e1452ecc80d422c0905a4b86089d24e80b
Tony Mak [Thu, 19 May 2016 12:40:38 +0000 (13:40 +0100)]
Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review
TODO: After updating all places that use the SDK, remove/hide the old API
Bug:
28842878
Change-Id: I131be644439080dd0507cd10d8bd6618246ee7ad
Paul Stewart [Fri, 20 May 2016 15:14:30 +0000 (08:14 -0700)]
Don't remove existing EAP configurations
When merging backed-up configurations with the current supplicant
configuration, we read both configurations into a instance of
WifiNetworkSettings. No EAP configurations should be restored as
per b/
25725016, however existing EAP configurations that already
reside in wpa_supplicant.conf (presumably configured in SUW)
should not be removed in the process.
This CL adds a parameter to the "readNetworks" method to allow it
to select whether or not EAP configurations should be read in. It
is used to allow the "restoreWifiSupplicant" method to copy in EAP
configurations from the existing wpa_supplicant.conf, but not out
of the backup data.
BUG:
28873992
Change-Id: I8b3e0c1a6629b3f1ca5055b1b2190e6b3ca4c033
Jason Monk [Fri, 20 May 2016 15:21:59 +0000 (11:21 -0400)]
Nav bar: fix tablet density change issues
- Re-inflate the contents of the NavigationBarInflaterView
- Call up to parent to notify the contents has been reinflated
- Fix how default tunable is handled, so that the resource is
reloaded on density change
Change-Id: If25f68d01eedd3319b0c270e1cf80ac382eea637
Fixes:
27227522
Chris Wren [Tue, 17 May 2016 21:11:29 +0000 (17:11 -0400)]
rate limit notification enqueues
This is distinct from and in addition to the limit on the number of
distinct notifications. This includes many updates to a single
notification.
Bug:
28693065
Change-Id: I5ec0911716cace91d3ad85435a5c6123b290b3a2
Jason Monk [Fri, 20 May 2016 13:48:01 +0000 (13:48 +0000)]
Merge "QS Edit: Better handling if drags" into nyc-dev
am:
b8fe7e8bff
* commit '
b8fe7e8bffea93ceb30a0d827f2ac573472507dd':
QS Edit: Better handling if drags
Change-Id: I7fb0e3f2f85b2d6e276fbc059403c1c48fa2d46f
Jason Monk [Fri, 20 May 2016 13:42:56 +0000 (13:42 +0000)]
Merge "QS Edit: Better handling if drags" into nyc-dev
Neil Fuller [Fri, 20 May 2016 13:00:34 +0000 (13:00 +0000)]
Merge "Add support for ICU data pinning in the Zygote" into nyc-dev
am:
761f70d5a6
* commit '
761f70d5a6b926780db3bba95ee1e01b4d8d95be':
Add support for ICU data pinning in the Zygote
Change-Id: I7468ed57102b4eafdf9beb92119cd72b2aadfee2
Neil Fuller [Fri, 20 May 2016 12:53:46 +0000 (12:53 +0000)]
Merge "Add support for ICU data pinning in the Zygote" into nyc-dev
Alan Leung [Fri, 20 May 2016 06:15:05 +0000 (06:15 +0000)]
Merge "Enable boost-locked-region-priority" into nyc-dev
am:
430894d1bb
* commit '
430894d1bbac3ceb94dc2f57334858178fa53e97':
Enable boost-locked-region-priority
Change-Id: I2669b7d7a94f782c767eb4f9a6ecfcd971ca9da1
Alan Leung [Fri, 20 May 2016 06:09:13 +0000 (06:09 +0000)]
Merge "Enable boost-locked-region-priority" into nyc-dev
Siyamed Sinir [Fri, 20 May 2016 01:26:09 +0000 (18:26 -0700)]
setTransformationMethod should reset mTextDir
When transformation method is set via API, text direction heuristics has
to be reset since for PasswordTransformationMethod it is set to LTR. Not
resetting it causes inconsistencies with the remaining of the TextView.
Bug:
28562779
Change-Id: I225e35e39bde60d4296852ff17b107d5b7b99f8a
Ta-wei Yen [Fri, 20 May 2016 01:07:56 +0000 (01:07 +0000)]
Merge "Hide VoicemailContract.setQuota()" into nyc-dev
am:
4f2a1d0913
* commit '
4f2a1d09133f133ac23b99485713a5ea5b7ea43c':
Hide VoicemailContract.setQuota()
Change-Id: I11017309443435f9fe840c72deada0c7984f5ce9
Ta-wei Yen [Fri, 20 May 2016 01:06:04 +0000 (01:06 +0000)]
Merge "Rename visual voicemail sync intent value" into nyc-dev
am:
0f712b164f
* commit '
0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
Rename visual voicemail sync intent value
Change-Id: I677dcd6e8261dfdbf4ab203ef1232f9f599a0687
OSDN Git Service
