124933 Commits

Author SHA1 Message Date
Fabrice Di Meglio
5cdb8d1d99 am 9c918534: (-s ours) am db3e7782: am 71c3a3d9: am 6c3a45d7: am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
* commit '9c9185348ad2487aad043c565fe221b4a56ef0b9':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
2014-03-06 02:29:01 +00:00
Fabrice Di Meglio
2af0f354f5 am dfb76305: (-s ours) am 1eb5c055: am cf33fe68: am e1190a99: am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
* commit 'dfb76305c78ac596cf025e3410a04bd8221cfeab':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
2014-03-06 02:28:58 +00:00
Yohei Yukawa
f06569561f Introduce InputMethodSubtypeArray for memory efficient IPCs
This CL introduces InputMethodSubtypeArray which compresses
multiple instances of InputMethodSubtype to reduce the risk
of TransactionTooLargeException during IPCs.

There are some IMEs which rapidly adding new subtypes into
their supported language list. One problem here is that each
instance of InputMethodInfo internally owns the list of
supported subtypes. Basically it requires additional
200 ~ 300 bytes for each subtype when InputMethodInfo is
transffered via IPCs. We should keep the size less than
100 KB in typical scenario.

With this CL, the list of InputMethodSubtype is marshalled
with GZIP compression. Approximately one InputMethodInfo is
marshalled within 10 KB even when it has 100 subtypes.

No negative performance impact is observed so far. The cost of
decompression seems to be compensated by another optimization
in this CL. Actually marshalling cost is reduced with this CL
by caching the compressed data on demand.

BUG: 12954290
Change-Id: Ibb2940fcc02f3b3b51ba6bbe127d646fd7de7c45
2014-03-06 11:25:57 +09:00
Santos Cordon
03f0834a03 am a04a1fd1: am a45bb4be: am 77a60f00: Merge "Update permission description string." into klp-dev
* commit 'a04a1fd10304de3f7a471aae6c954548be760c12':
  Update permission description string.
2014-03-06 02:20:36 +00:00
Griff Hazen
47826bfa16 am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev
* commit 'c748341af5616e183303dbe3267627a7f08aea37':
  Add addExtras and getExtras to Notification.Builder.
2014-03-06 02:19:38 +00:00
Michael Wright
6b661fdcb6 am dd9f7cb2: Add Odie KL file.
* commit 'dd9f7cb2948af46047ab16d44c28a8f91948bdf5':
  Add Odie KL file.
2014-03-06 02:19:35 +00:00
Santos Cordon
a04a1fd103 am a45bb4be: am 77a60f00: Merge "Update permission description string." into klp-dev
* commit 'a45bb4be2f12144754aa62a5d44c39db08b21c92':
  Update permission description string.
2014-03-06 02:14:46 +00:00
Griff Hazen
c748341af5 Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev 2014-03-06 02:05:38 +00:00
Griff Hazen
720042b72f Add addExtras and getExtras to Notification.Builder.
addExtras allows merging with exiting set extras instead of replacing
them. This matches the similar function putExtras in Intent.

Both functions are useful for multi-stage notification building logic.

Change-Id: Ice3e4a53ec05b7129ebdac14e2084163946273a4
2014-03-05 18:00:57 -08:00
Santos Cordon
a45bb4be2f am 77a60f00: Merge "Update permission description string." into klp-dev
* commit '77a60f006f8b7260207043529d3ed004db301bd5':
  Update permission description string.
2014-03-06 01:56:50 +00:00
Filip Gruszczyński
b50cea0267 resolved conflicts for merge of 1569d61f to master
Change-Id: I5bc751a2ae52a8d7542b5b49d27fc90b4a1c7673
2014-03-05 17:56:40 -08:00
Santos Cordon
77a60f006f Merge "Update permission description string." into klp-dev 2014-03-06 01:54:20 +00:00
Michael Wright
dd9f7cb294 Add Odie KL file.
Change-Id: I74cc90a3c66e876db51da8f9fd8ced3bac373032
2014-03-05 17:47:54 -08:00
Christopher Tate
cb20740ee1 Fix build. Silly gits.
Change-Id: I8f21b7239621da500d9a73eb17d350e06dda9b20
2014-03-05 17:22:25 -08:00
Michael Wright
fa2e53cc9f am 1f762b34: am 9aa7c6e5: am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev
* commit '1f762b3490ce3583354ac3bf23732e88ebdb7b81':
  Revert Japanese special case fallback keys.
2014-03-06 01:07:30 +00:00
Michael Wright
1f762b3490 am 9aa7c6e5: am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev
* commit '9aa7c6e583ac18d6c338af8d478512c4ab5293b4':
  Revert Japanese special case fallback keys.
2014-03-06 01:03:52 +00:00
Jason Sams
edf0b79d55 am 24ea88a9: am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context."
* commit '24ea88a986cfb6de7197b213ad933a6eb6f0e285':
  Validate objects are from the correct context.
2014-03-06 01:03:09 +00:00
Michael Wright
9aa7c6e583 am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev
* commit 'e4a7179278375f48171746ffe93ca4529a927ecb':
  Revert Japanese special case fallback keys.
2014-03-06 01:00:43 +00:00
Jason Sams
24ea88a986 am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context."
* commit '9a9916b58fb22da735d18a03beffb24b4d5cd9a3':
  Validate objects are from the correct context.
2014-03-06 00:59:17 +00:00
David 'Digit' Turner
fd2c77ca24 am 4bd720c2: am a05e7526: am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sysroot."
* commit '4bd720c2c63b2400437db971ac96616693a8fe3b':
  aidl: Support building with updated host sysroot.
2014-03-06 00:59:15 +00:00
Dianne Hackborn
f0dd80f673 am a984c582: am 75870cf3: am 75374879: am ea391750: am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump.
* commit 'a984c5828749185ce560aa1e29661a5dadc93fbd':
  Issue #13308712: Add --checkin to package manager dump.
2014-03-06 00:59:12 +00:00
Svetoslav
58af2ac338 am 28ba546c: am 8c6ed03c: am 1caa092f: Allow click listener registration in NumberPicker.
* commit '28ba546c91418978f18a3da5e265e27d57d4f14e':
  Allow click listener registration in NumberPicker.
2014-03-06 00:59:09 +00:00
Michael Wright
e4a7179278 am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev
* commit '4448f9d7ade3d08a29b1a191e182a403c5584388':
  Revert Japanese special case fallback keys.
2014-03-06 00:56:59 +00:00
Jason Sams
9a9916b58f am 2383f220: Merge "Validate objects are from the correct context."
* commit '2383f2200ab0c2dbd71708b5c1fb6af98db408fa':
  Validate objects are from the correct context.
2014-03-05 16:56:02 -08:00
Michael Wright
4448f9d7ad am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev
* commit 'c5dea68e9856698953dafca868eaee7207614641':
  Revert Japanese special case fallback keys.
2014-03-06 00:53:22 +00:00
Jason Sams
2383f2200a Merge "Validate objects are from the correct context." 2014-03-06 00:50:24 +00:00
Michael Wright
c5dea68e98 Merge "Revert Japanese special case fallback keys." into klp-dev 2014-03-06 00:50:15 +00:00
Fabrice Di Meglio
9c9185348a am db3e7782: am 71c3a3d9: am 6c3a45d7: am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
* commit 'db3e77825d339cbe8840486bffbf7e03a53c1c4c':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
2014-03-06 00:45:47 +00:00
Fabrice Di Meglio
dfb76305c7 am 1eb5c055: am cf33fe68: am e1190a99: am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
* commit '1eb5c0551f98b0340db37525f1f490c2d100cf38':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
2014-03-06 00:45:44 +00:00
Chris Craik
dc66ee2103 Merge "Fix warnings in hwui" 2014-03-06 00:44:06 +00:00
Fabrice Di Meglio
db3e77825d am 71c3a3d9: am 6c3a45d7: am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
* commit '71c3a3d9474e1ce4210209bbd68055f3b780057d':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
2014-03-06 00:42:36 +00:00
Fabrice Di Meglio
1eb5c0551f am cf33fe68: am e1190a99: am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
* commit 'cf33fe683d2cd9ea25fa83f5354c682a788ec074':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
2014-03-06 00:42:33 +00:00
Fabrice Di Meglio
71c3a3d947 am 6c3a45d7: am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
* commit '6c3a45d7df0dc708e3981c79df32b5bb3fb1758a':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
2014-03-06 00:38:57 +00:00
Fabrice Di Meglio
cf33fe683d am e1190a99: am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
* commit 'e1190a994e7d86ae7ad6f4680b7cd58d50d4a770':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
2014-03-06 00:38:52 +00:00
Chris Craik
eea6ef9c76 Fix warnings in hwui
Change-Id: I6ad6b78531cc0426dc2ea82a32775f7b0265b5b1
2014-03-05 16:37:35 -08:00
Fabrice Di Meglio
6c3a45d7df am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
* commit '57f8a4b4ed48ae3e2488bb3bafcd40137c71ec18':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
2014-03-06 00:35:40 +00:00
Fabrice Di Meglio
e1190a994e am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
* commit 'cb6dcd7af2d015b7a3d49f1224936241747bcb43':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
2014-03-06 00:35:36 +00:00
John Reck
1f3c72c5e2 Merge "Detach disappearing children in onDetach" 2014-03-06 00:35:14 +00:00
Filip Gruszczyński
1569d61f66 am d54530e9: am 1ae480a2: Merge changes I2104037d,I125c4a00 into klp-modular-dev
* commit 'd54530e9cecda7bc69d6479bae4c48189bcf50e9':
  Passing and using defStyle in ViewGroup initFromAttributes.
  Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork.
2014-03-06 00:33:32 +00:00
Fabrice Di Meglio
57f8a4b4ed am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
* commit '1ff2df6194148f487ccb014a7c5302fa8ffe2571':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
2014-03-06 00:32:30 +00:00
Fabrice Di Meglio
cb6dcd7af2 am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
* commit '2b58a29f825e6442d8767a36adaf1770b86d5725':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
2014-03-06 00:32:27 +00:00
John Reck
ca7a9da76d Detach disappearing children in onDetach
Bug: 13324881

Change-Id: Iba6501b164842c5786a6f4763e334e6c80c6fa41
2014-03-06 00:31:34 +00:00
Filip Gruszczyński
d54530e9ce am 1ae480a2: Merge changes I2104037d,I125c4a00 into klp-modular-dev
* commit '1ae480a24deed18cb1ca95344995150f3a3f5c98':
  Passing and using defStyle in ViewGroup initFromAttributes.
  Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork.
2014-03-06 00:30:17 +00:00
Fabrice Di Meglio
1ff2df6194 Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev 2014-03-06 00:29:35 +00:00
Fabrice Di Meglio
2b58a29f82 Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev 2014-03-06 00:29:20 +00:00
Filip Gruszczyński
1ae480a24d Merge changes I2104037d,I125c4a00 into klp-modular-dev
* changes:
  Passing and using defStyle in ViewGroup initFromAttributes.
  Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork.
2014-03-06 00:27:40 +00:00
Chris Craik
8b6f2df48e Draw shadows from casters together if the Z values are similar
Change-Id: Ib5d00c83e81d9d4c384685a84988a681da8b4490
2014-03-05 16:25:50 -08:00
Christopher Tate
9941a289b7 Merge "am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev" 2014-03-06 00:19:14 +00:00
Christopher Tate
ff8b037c10 am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev
* commit '777b8a808ee76401429f7210ebb7194632040d45':
  Adapt to underlying changes in the PBKDF2 implementation

Change-Id: Ia68694a03e52693fceaedc6740dbd8e690e21257
2014-03-05 16:17:34 -08:00
Robert Greenwalt
ea3bfc68ea am 2d07e8d6: am c1ca3bac: am bf9eec4c: am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev
* commit '2d07e8d60e44e320b0c39d63e763d79a7befadf3':
  Only apply tcp buffer sizes for default net
2014-03-06 00:14:30 +00:00