Commit Graph

66943 Commits

Author SHA1 Message Date
Roshan Pius
651209b597 XmlUtils: Add missing readThisByteArrayXml method
Add the missing XML to byte array conversion method.

While there,
1. Fix writeByteArrayXml method to store the hex chars of the value.
2. Cleanup couple of error strings in |readThisIntArrayXml| method.

BUG: 29039296
Change-Id: I6386f7df7c5c8b7bc3bc5a268196da617209cea9
TEST: Compiles & manual testing.
2016-05-31 13:36:32 -07:00
Fyodor Kupolov
63cd09dfb4 Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev am: 2c5cbd4012
am: 0ebf3cc47c

* commit '0ebf3cc47c9d20613f02ca263a2394d80455a09a':
  Clean up demo dir when leaving demo mode

Change-Id: Ib3338a18e75f04e15a1d77a82e5ac1aba246a5bb
2016-05-27 01:02:29 +00:00
Fyodor Kupolov
0ebf3cc47c Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev
am: 2c5cbd4012

* commit '2c5cbd4012aef736c94a7afc84a778623c639d10':
  Clean up demo dir when leaving demo mode

Change-Id: Ia7891f8e5106130d669a1daa7fcc691db1f5e4c7
2016-05-27 00:54:20 +00:00
Fyodor Kupolov
2c5cbd4012 Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev 2016-05-27 00:48:38 +00:00
Doris Liu
f143417bab Merge "Handle hidden RT VectorDrawable animators" 2016-05-26 20:45:33 +00:00
Doris Liu
67ce99b66e Handle hidden RT VectorDrawable animators
This CL changes the target of VD specific animators to VectorDrawable,
instead of RenderNode. The benefit of doing so is that animators can
now detect whether the animation is meaningful by checking whether
their VD target is in the display list. If not, that means the VD is
not drawing for the current frame, in which case we can be smarter
and more power efficient by removing the animator from the list and
posting a delayed onFinished listener callback.

By setting VD as the animation target, when an ImageView decides to
update its drawable from one AVD to something else, we'll be able
to detect that the previous AVD is no longer in the display list,
and stop providing animation pulse to the stale AVD, which is
something we couldn't do previously.  This change also
handles the case where one AVD instance could be drawn in two
different views.

Bug: 27441375
Change-Id: Id4b3b37f28274c917cb9beb9dcd3d1e6991b5c5d
2016-05-26 11:13:19 -07:00
Ji Yang
811d0411f3 Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: e6c6ca417d
am: 54b280ba66

* commit '54b280ba66d8f92d73711df4d02add1140eb416f':
  Rename carrier messaging API constant.

Change-Id: Ib94ec913651d3b0c92e43927cb8a091732319777
2016-05-26 16:31:58 +00:00
Ji Yang
54b280ba66 Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff
am: e6c6ca417d

* commit 'e6c6ca417da6f62de4bdebd7b380f12b751a08b7':
  Rename carrier messaging API constant.

Change-Id: I9e2d1c3572a6e7658e6ba66a7d4c01fd4a4c805a
2016-05-26 16:12:55 +00:00
Ji Yang
e6c6ca417d Merge "Rename carrier messaging API constant." into nyc-dev
am: f7375b46ff

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
  Rename carrier messaging API constant.

Change-Id: I476b10118136b13a49b1d55864bbef8e568d6c7e
2016-05-26 15:54:38 +00:00
Ji Yang
f8969b233c Merge "Rename carrier messaging API constant." into nyc-dev
am: f7375b46ff

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
  Rename carrier messaging API constant.

Change-Id: I0e6713e07899cde7780b433c0f3053e344e6d327
2016-05-26 15:54:27 +00:00
Ji Yang
f7375b46ff Merge "Rename carrier messaging API constant." into nyc-dev 2016-05-26 15:40:12 +00:00
Michael Wright
5944e07e99 Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e
am: 4f6ae7bbaa

* commit '4f6ae7bbaa4654e14d70e9fa503ceb713c90c342':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: Ieceb1c9248bfc618ed1c70821d4cf746128bc679
2016-05-26 14:51:30 +00:00
Ricky Wai
f7a58e292c Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 am: 754ddca748" into nyc-mr1-dev-plus-aosp
am: 1db5fc9810

* commit '1db5fc9810c412aafcfe430285943c6797e8e3fc':
  Add resetKeyStore() in LockSettingsService

Change-Id: Ia3a5c7156fd7774bffa8e4b5ad4d81b36e408923
2016-05-26 14:51:20 +00:00
Michael Wright
4f6ae7bbaa Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
am: c396f0f70e

* commit 'c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: Iede50a709849ed27cb9723a565b946e00fb23be7
2016-05-26 14:39:03 +00:00
Michael Wright
28984d4d80 Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
am: c396f0f70e

* commit 'c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: I77cb742feacdd3b8af0cf33d4e7ab246f776417f
2016-05-26 14:38:56 +00:00
Ricky Wai
e1855ce492 Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4
am: 754ddca748

* commit '754ddca748d7a8d3e55f4d90c07ca140a7ed312d':
  Add resetKeyStore() in LockSettingsService

Change-Id: Ic5d0e880c85754a4c198597c80c7eacfa1b1516a
2016-05-26 14:35:30 +00:00
Ricky Wai
754ddca748 Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
am: 1cb6f9d8a4

* commit '1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e':
  Add resetKeyStore() in LockSettingsService

Change-Id: I6af43eb9f472c1d5a1f9356a9b618a183200e38e
2016-05-26 14:03:51 +00:00
Ricky Wai
9b22e5b4e8 Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
am: 1cb6f9d8a4

* commit '1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e':
  Add resetKeyStore() in LockSettingsService

Change-Id: I0125a334fac098183e68fa0b9cd24bda64a88fae
2016-05-26 14:03:51 +00:00
Michael Wright
c396f0f70e Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 2016-05-26 14:03:47 +00:00
Ricky Wai
1cb6f9d8a4 Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev 2016-05-26 13:46:26 +00:00
Seigo Nonaka
a0cb2c4931 Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657 am: b03e7217f3
am: d34ca400c6

* commit 'd34ca400c6f8cd25827e0278dd9062d82b0fbf08':
  Fix system locale propagation during user creation.

Change-Id: I41229dce52266d59c3b3334e2d4ae390b75bbe20
2016-05-26 04:34:26 +00:00
Seigo Nonaka
d34ca400c6 Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657
am: b03e7217f3

* commit 'b03e7217f3fa3144f69119a4e109cce934d6065a':
  Fix system locale propagation during user creation.

Change-Id: I6955bad489926525f6b50709bcf14b829ca9392d
2016-05-26 04:17:39 +00:00
Seigo Nonaka
b03e7217f3 Merge "Fix system locale propagation during user creation." into nyc-dev
am: ce9f5e3657

* commit 'ce9f5e3657b7a8fb68c6c65a2cd5a27eaf556cc8':
  Fix system locale propagation during user creation.

Change-Id: If31dcbe28d108ec12aa9f4aef4382dcb2da90aaf
2016-05-26 04:07:40 +00:00
Seigo Nonaka
005ef10518 Merge "Fix system locale propagation during user creation." into nyc-dev
am: ce9f5e3657

* commit 'ce9f5e3657b7a8fb68c6c65a2cd5a27eaf556cc8':
  Fix system locale propagation during user creation.

Change-Id: I020babcf2ce1aa632099457f2baf3497f5ac2946
2016-05-26 04:07:33 +00:00
Seigo Nonaka
ce9f5e3657 Merge "Fix system locale propagation during user creation." into nyc-dev 2016-05-26 03:51:39 +00:00
Adam Lesinski
e3b163035d Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a am: fbdf46f663
am: 0c2f681bdf

* commit '0c2f681bdfacc5504c101945d5421f892184a007':
  Use app's best locale if they override LocaleList

Change-Id: I9913e7466450a83bd5872abc62cfaac3d235d8d8
2016-05-26 02:45:13 +00:00
Adam Powell
8c6e691c09 Merge "N is API 24" into nyc-dev am: bc983c4431 am: 0b478d5b05
am: 3579a6a634

* commit '3579a6a63474918be6d7d3df21bcf132e8dc0e54':
  N is API 24

Change-Id: I15afe037702682bb124355b8da31af37444ded2b
2016-05-26 02:21:03 +00:00
Adam Lesinski
0c2f681bdf Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a
am: fbdf46f663

* commit 'fbdf46f66323e80d4e90e926d0f199b64bf71f14':
  Use app's best locale if they override LocaleList

Change-Id: I99bb920efcc7befa2817bed3a7fb7a0bcad4a13e
2016-05-26 02:10:48 +00:00
Adam Powell
3579a6a634 Merge "N is API 24" into nyc-dev am: bc983c4431
am: 0b478d5b05

* commit '0b478d5b052c4440a0eb8686d400d1595ead1857':
  N is API 24

Change-Id: I90b772e177cefff1071a9859f046f683411a7e59
2016-05-26 01:56:59 +00:00
Adam Lesinski
fbdf46f663 Merge "Use app\'s best locale if they override LocaleList" into nyc-dev
am: fbf3a0964a

* commit 'fbf3a0964a458508f834bffd18198394037bb5c1':
  Use app's best locale if they override LocaleList

Change-Id: I5a38d95f1ea7d7fd676fa60effa467af219c75cf
2016-05-26 01:38:34 +00:00
Adam Lesinski
ade0bce32a Merge "Use app\'s best locale if they override LocaleList" into nyc-dev
am: fbf3a0964a

* commit 'fbf3a0964a458508f834bffd18198394037bb5c1':
  Use app's best locale if they override LocaleList

Change-Id: I980061c2e818a746eb46e64a88887be8566ad618
2016-05-26 01:38:22 +00:00
Adam Powell
0b478d5b05 Merge "N is API 24" into nyc-dev
am: bc983c4431

* commit 'bc983c443139c7b4605f98d56bd9ad7652a9938b':
  N is API 24

Change-Id: Ib90f6e51c793d1cb61f806196b93736edf2014d8
2016-05-26 01:22:00 +00:00
Adam Powell
528a5bd466 Merge "N is API 24" into nyc-dev
am: bc983c4431

* commit 'bc983c443139c7b4605f98d56bd9ad7652a9938b':
  N is API 24

Change-Id: Ic45d31eb721e9831fafd5413ce60947eb7fbad7e
2016-05-26 01:21:19 +00:00
TreeHugger Robot
fbf3a0964a Merge "Use app's best locale if they override LocaleList" into nyc-dev 2016-05-26 01:11:03 +00:00
TreeHugger Robot
bc983c4431 Merge "N is API 24" into nyc-dev 2016-05-26 01:03:08 +00:00
Phil Weaver
1f68154716 Merge "Improve accessibility window title behavior" into nyc-dev am: 7ab1a4d286 am: 0a16a8d1d6
am: f6a1e1fe05

* commit 'f6a1e1fe05885cfa2f5aebf9102bcac7daa4bcfa':
  Improve accessibility window title behavior

Change-Id: Icc64e6cfe827e93c5b5be11c8244e681c037d952
2016-05-26 00:48:40 +00:00
Phil Weaver
f6a1e1fe05 Merge "Improve accessibility window title behavior" into nyc-dev am: 7ab1a4d286
am: 0a16a8d1d6

* commit '0a16a8d1d6ee63519123857dc4f305c96de7198b':
  Improve accessibility window title behavior

Change-Id: I0b0f95fb78e342cd17a85c7077f6e13a44ed0045
2016-05-26 00:24:59 +00:00
Phil Weaver
0a16a8d1d6 Merge "Improve accessibility window title behavior" into nyc-dev
am: 7ab1a4d286

* commit '7ab1a4d286898acffd1f3b444f9efc9e1d2a104e':
  Improve accessibility window title behavior

Change-Id: Iff0d61871f48a66510e1fab72adbfb062c01c203
2016-05-26 00:19:19 +00:00
Phil Weaver
062d24f9ec Merge "Improve accessibility window title behavior" into nyc-dev
am: 7ab1a4d286

* commit '7ab1a4d286898acffd1f3b444f9efc9e1d2a104e':
  Improve accessibility window title behavior

Change-Id: I29286da845751351f3dcf603efb12441a6efe74e
2016-05-26 00:18:34 +00:00
Phil Weaver
7ab1a4d286 Merge "Improve accessibility window title behavior" into nyc-dev 2016-05-26 00:11:25 +00:00
Adam Lesinski
27d301667b Use app's best locale if they override LocaleList
App's can technically override their configuration's Locale,
which means we must choose the overriden locale as the best,
and therefore set the LocaleList.setDefault() with that locale.

Bug:28953437
Change-Id: I4b301fcd6bc426e37bb389d3a6f2b4a3c69ac33a
2016-05-25 16:45:14 -07:00
Adam Powell
43ec62af45 N is API 24
Change-Id: Ifea71ccff96c3c70f9f3e60ecdcb2b56af82bb08
2016-05-25 16:42:56 -07:00
Antonio Cansado
4342f4419f Merge "Cleaning up NetworkStatsManager." into nyc-dev am: c45f0aea71 am: f49cbec84c
am: cc1524eded

* commit 'cc1524edede07e2139cd072d6256fa96952f4004':
  Cleaning up NetworkStatsManager.

Change-Id: I3f669191e7c7739870dc098d5d6357d1d3ceb6dd
2016-05-25 22:43:26 +00:00
Antonio Cansado
cc1524eded Merge "Cleaning up NetworkStatsManager." into nyc-dev am: c45f0aea71
am: f49cbec84c

* commit 'f49cbec84c1e2aa21b33d54ae97c54ed9c71bb32':
  Cleaning up NetworkStatsManager.

Change-Id: I0fd280e158eb3cfeb0b4f6066cc890439cffa02c
2016-05-25 22:34:18 +00:00
Siyamed Sinir
4001c11816 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev am: e747160509 am: baf8284c62
am: 1f4c99f7d8

* commit '1f4c99f7d88d7ccf1414c56fb38bbce08b8f30ea':
  Fix TextView layout reuse when maxLines is set

Change-Id: I52420052fbc85c346e861d66841d2b7aee4ac1ca
2016-05-25 22:25:50 +00:00
Antonio Cansado
c37ba5cbc1 Merge "Cleaning up NetworkStatsManager." into nyc-dev
am: c45f0aea71

* commit 'c45f0aea71944464b7636023f56a53fa635c09e2':
  Cleaning up NetworkStatsManager.

Change-Id: I236ffb5f753834931511d7df01333670de01604f
2016-05-25 22:25:27 +00:00
Antonio Cansado
f49cbec84c Merge "Cleaning up NetworkStatsManager." into nyc-dev
am: c45f0aea71

* commit 'c45f0aea71944464b7636023f56a53fa635c09e2':
  Cleaning up NetworkStatsManager.

Change-Id: Id556eb00f5183a2f6905020f24f5d3f5f8d02795
2016-05-25 22:25:11 +00:00
Antonio Cansado
c45f0aea71 Merge "Cleaning up NetworkStatsManager." into nyc-dev 2016-05-25 22:17:21 +00:00
Siyamed Sinir
1f4c99f7d8 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev am: e747160509
am: baf8284c62

* commit 'baf8284c62e708a2d7817319c9e5f8948f6e5f5f':
  Fix TextView layout reuse when maxLines is set

Change-Id: I0334f59dee1599a77c216a0a18e030247a41e55f
2016-05-25 22:13:28 +00:00
Siyamed Sinir
baf8284c62 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev
am: e747160509

* commit 'e747160509e71a05430168b1c8a28400b6a18403':
  Fix TextView layout reuse when maxLines is set

Change-Id: I7f1d3acb519a91388dbf03db28ee039b5d4b7b1c
2016-05-25 22:09:31 +00:00