Commit Graph

37111 Commits

Author SHA1 Message Date
Jorim Jaggi
39fa59fc49 Change appearance of notifications to light theme.
Change-Id: Ic15e96582d6b46b4dc195b1c7c0cef38f25f0d38
2014-03-07 14:34:17 +01:00
Narayan Kamath
3a26ed5ab3 Merge "Support deprecated language codes." 2014-03-07 09:17:22 +00:00
Yohei Yukawa
ae90d762c3 Merge "Introduce InputMethodSubtypeArray for memory efficient IPCs" 2014-03-07 08:27:23 +00:00
John Reck
34dbce14e8 Switch WebView to onDetachedFromWindowInternal
Change-Id: I1036f48f3c98492421430c3894f937884fb4c63e
2014-03-06 15:54:54 -08:00
John Reck
b14dfe20ef Revert "Revert "Workaround apps not calling super.onDetachedFromWindow()""
This reverts commit bac16fae7e.

Change-Id: I61e997b23fac1aa984129fdc0328426ff8891bdd
2014-03-06 14:12:35 -08:00
Bart Sears
acbc41d656 Merge "Revert "Workaround apps not calling super.onDetachedFromWindow()"" 2014-03-06 21:10:06 +00:00
Bart Sears
bac16fae7e Revert "Workaround apps not calling super.onDetachedFromWindow()"
Requested by jreck to fix the build.

This reverts commit 198d20842a.

Change-Id: I733065cc124b59bf914034f5bac5e2e951a5b604
2014-03-06 21:09:51 +00:00
John Reck
d621e77c8d Merge "Workaround apps not calling super.onDetachedFromWindow()" 2014-03-06 20:42:52 +00:00
John Reck
198d20842a Workaround apps not calling super.onDetachedFromWindow()
Bug: 13338698
 Move the releasing of hardware resources to a new
 @hide onDetachedFromWindowInternal

Change-Id: I52b4e6ba4d5b3ce20b89cabffa248d1d780e3e81
2014-03-06 12:40:49 -08:00
Jeff Davidson
16340670af Merge "Add a warning about the SSID format in CaptivePortalTracker." 2014-03-06 18:22:07 +00:00
Chris Craik
b7d0cfa0d8 Merge "Add Path.isConvex, and force View outlines to be convex" 2014-03-06 18:18:59 +00:00
Martijn Coenen
ae2a35baf4 am 4d328a79: am a43f7cb0: am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field."
* commit '4d328a79bdee417c1248660b1c33b5cd86dbd814':
  NFC: getNdefMessage() should throw exception if no tag in field.
2014-03-06 16:21:46 +00:00
Martijn Coenen
a43f7cb01e am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field."
* commit '1507c18f87da9906337237d34184d6ac8f1afabd':
  NFC: getNdefMessage() should throw exception if no tag in field.
2014-03-06 15:54:40 +00:00
Martijn Coenen
29e55bef77 Merge "NFC: getNdefMessage() should throw exception if no tag in field." 2014-03-06 14:33:11 +00:00
Narayan Kamath
21fc8ba39c Support deprecated language codes.
Locale.toLanguageTag will transform the obsolete (and
deprecated) language codes "in", "ji" and "iw" to
"id", "yi" and "he" respectively.

All versions of android prior to "L" used the deprecated
language tags, so we will need to support them for backwards
compatibility.

bug: 13230947

Change-Id: Ib63567786bcbe780ceb0487d8f583b75a5452aea
2014-03-06 12:15:43 +00:00
Dianne Hackborn
97ae538554 Formalize time bases in battery stats.
Battery stats used to revolve around a single time base
it maintained, "battery uptime and realtime."  This is derived
from the system's uptime and realtime, but only increments while
the device is on battery.  It is used to update its timers for
things like the screen being on, wake locks, etc only while the
device is not plugged in to power.

This change formalizes that time base into a separate class that
maintains all of its state.  This is used to introduce a new
time base, "battery screen off," which only increments while the
device is on battery *and* the screen is off.  Wake locks are now
based on this time base, so we don't count them while the screen
is on -- it is misleading to have them increment while the screen
is on because the device is defined to always stay awake anyway
during that time, so what they are doing is irrelevant.

Change-Id: I020e20c930d8dca2953c6c3ddef1dc93c24161a5
2014-03-05 21:48:07 -08:00
Griff Hazen
5ab311550f am 6daf22ca: am 47826bfa: am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev
* commit '6daf22ca7680261e07dfd298a43d6e473e6c06f6':
  Add addExtras and getExtras to Notification.Builder.
2014-03-06 02:57:21 +00:00
Michael Wright
ecc7ca5385 resolved conflicts for merge of fa2e53cc to master
Change-Id: Idc54765c28ab7c6c810095aba1ba21d7695e08d5
2014-03-05 18:46:22 -08: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
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
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
Filip Gruszczyński
b50cea0267 resolved conflicts for merge of 1569d61f to master
Change-Id: I5bc751a2ae52a8d7542b5b49d27fc90b4a1c7673
2014-03-05 17:56:40 -08: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
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
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
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
Michael Wright
c5dea68e98 Merge "Revert Japanese special case fallback keys." into klp-dev 2014-03-06 00:50:15 +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
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
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
John Reck
2665f6e9f5 Merge "Remove invalid usage of DisplayList.isValid()" 2014-03-06 00:07:29 +00:00
John Reck
7558aa7081 Remove invalid usage of DisplayList.isValid()
Bug: 13324734

 Editor was using isValid as a mechanism to track whether or not it
 needed to re-record the DisplayList. This is not correct as isValid()
 is not a general-purpose dirty bit. Add an explicit dirty bit for
 Editor to use instead

Change-Id: I5608b151791870fca3681056b5507bd39ee48f52
2014-03-05 15:01:04 -08:00
Svetoslav
8c6ed03c8f am 1caa092f: Allow click listener registration in NumberPicker.
* commit '1caa092f94aaa4b9b7b382263dfd13581d92d2de':
  Allow click listener registration in NumberPicker.
2014-03-05 22:55:58 +00:00
Filip Gruszczyński
c16ba8cda7 Passing and using defStyle in ViewGroup initFromAttributes.
Change-Id: I2104037d6f701aa3a27bf09226aca171ec77495d
2014-03-05 14:43:49 -08:00
Svetoslav
1caa092f94 Allow click listener registration in NumberPicker.
NumberPicker is composed of three areas, increment, decrement, and value,
which take the entire space. Hence, adding a click listener was a no-op.
Clicking on the value brings up the IME but for devices with very small
screens a developer may want to override this default behavior to say
confirm the selection.

This change allows adding a click listener to NumberPicker to override the
behavior of clicking on the current value. This is applicable only to the
new look and feel of the NumberPicker, i.e. the holo themes. This change
is safe as previously setting a click listener had no effect.

bug:13287234

Change-Id: I34e12a2e2bd64344a4797153fa6c820001a4722e
(cherry picked from commit 46a27efe95)
2014-03-05 22:37:34 +00:00
Svetoslav
dd2ce3448b Merge "Allow click listener registration in NumberPicker." 2014-03-05 22:35:13 +00:00
John Reck
8f649dda50 Merge "DisplayList lifecycle fixes" 2014-03-05 21:05:39 +00:00
John Reck
eef19cc2ee DisplayList lifecycle fixes
Bug: 13324014
 Bug: 13324861

 Don't use a DisplayList for the background if the View is detached.
 mAttachInfo can be null in onDetachedFromWindow

Change-Id: I6d1413b956dd35cd2f5256860223013d2a570870
2014-03-05 13:02:00 -08:00