Romain Guy
17e858a9c0
Merge "Skip 2nd measure pass whenever possible"
2013-04-25 18:54:25 +00:00
Romain Guy
e8fb03c058
Skip 2nd measure pass whenever possible
...
If the height measured during the horizontal pass fits within the
constraints of the vertical pass we can skip the second call to
child.measure().
Change-Id: I3aebf78967e5920ffb28bbe8985ca7a426327a82
2013-04-25 11:49:26 -07:00
Jeff Sharkey
5adb34f022
Always close incoming PFD to avoid leaking.
...
Change-Id: I9559bb1e83c9bf2f9fd2af9c7b0d8b9e3aadc4ae
2013-04-25 11:35:12 -07:00
Amith Yamasani
269c068de9
am df181185: Merge "Hide TYPE_CHOICE_LEVEL since there\'s no visual representation for it yet." into jb-mr2-dev
...
* commit 'df18118529eecf7f9bd821552015fea5182c8840':
Hide TYPE_CHOICE_LEVEL since there's no visual representation for it yet.
2013-04-25 11:18:04 -07:00
Amith Yamasani
df18118529
Merge "Hide TYPE_CHOICE_LEVEL since there's no visual representation for it yet." into jb-mr2-dev
2013-04-25 18:06:02 +00:00
Ben Gruver
0882a90e1a
am 09bb9f66: Merge "Ensure the intent firewall dir exists before starting the FileObserver" into jb-mr2-dev
...
* commit '09bb9f66a0c258d3393145d31529de92e55e039a':
Ensure the intent firewall dir exists before starting the FileObserver
2013-04-25 10:42:04 -07:00
Ben Gruver
09bb9f66a0
Merge "Ensure the intent firewall dir exists before starting the FileObserver" into jb-mr2-dev
2013-04-25 17:40:41 +00:00
Amith Yamasani
d5e946a52c
Hide TYPE_CHOICE_LEVEL since there's no visual representation for it yet.
...
Bug: 8704663
Change-Id: Ia9931e3844305c8f84c127506ffedf3a17eeb80d
2013-04-24 21:37:36 -07:00
Michael Wright
072137c80a
Fixed javadoc in input related classes
...
Change-Id: Ie415f812a0f473488d74119dab18296a488db6b9
2013-04-24 20:41:20 -07:00
Michael Wright
007d4d7040
am a1e1d005: am 7c98c196: Merge "Mirror LTRIGGER / RTRIGGER as BRAKE / GAS for compatibility" into jb-mr2-dev
...
* commit 'a1e1d0053b0918218439c102bfffccba7f155af8':
Mirror LTRIGGER / RTRIGGER as BRAKE / GAS for compatibility
2013-04-24 20:26:49 -07:00
Michael Wright
a1e1d0053b
am 7c98c196: Merge "Mirror LTRIGGER / RTRIGGER as BRAKE / GAS for compatibility" into jb-mr2-dev
...
* commit '7c98c196282629fc7a842e67ceca3d9686f3f23a':
Mirror LTRIGGER / RTRIGGER as BRAKE / GAS for compatibility
2013-04-24 20:24:51 -07:00
Michael Wright
7c98c19628
Merge "Mirror LTRIGGER / RTRIGGER as BRAKE / GAS for compatibility" into jb-mr2-dev
2013-04-25 03:22:51 +00:00
Daniel Sandler
25cf8cee6f
New NotificationListener API: getActiveNotifications()
...
This allows a listener service to catch up on the current
state of the notification panel at any time, including at
startup.
Bug: 8656860
Change-Id: I1a3d665d84576e17870929a63dda334afc696010
2013-04-24 23:19:08 -04:00
Michael Wright
2b08c611c8
Mirror LTRIGGER / RTRIGGER as BRAKE / GAS for compatibility
...
Bug: 8590913
Change-Id: If2918a67ecdd946ed850acc002ca021e150ec39d
2013-04-24 20:08:40 -07:00
Dirk Dougherty
61adfd4c6e
am 2abcd158: am 7395838d: am 022131d0: am c9f01f0a: am 4a22f9a7: am 2a31f996: am bdf19c62: am 29743661: Doc change: fix typo in tablet guidelines.
...
* commit '2abcd158c51d58506c5bf8417931330ab65015c8':
Doc change: fix typo in tablet guidelines.
2013-04-24 19:55:23 -07:00
Dirk Dougherty
2abcd158c5
am 7395838d: am 022131d0: am c9f01f0a: am 4a22f9a7: am 2a31f996: am bdf19c62: am 29743661: Doc change: fix typo in tablet guidelines.
...
* commit '7395838d8e45cf39c34d2f2e18da2bedd3e4dc33':
Doc change: fix typo in tablet guidelines.
2013-04-24 19:53:30 -07:00
Dirk Dougherty
7395838d8e
am 022131d0: am c9f01f0a: am 4a22f9a7: am 2a31f996: am bdf19c62: am 29743661: Doc change: fix typo in tablet guidelines.
...
* commit '022131d06cc745fddd6877cfffd6d6eb73465e72':
Doc change: fix typo in tablet guidelines.
2013-04-24 19:50:46 -07:00
Dirk Dougherty
022131d06c
am c9f01f0a: am 4a22f9a7: am 2a31f996: am bdf19c62: am 29743661: Doc change: fix typo in tablet guidelines.
...
* commit 'c9f01f0a80809d6911fce0dbb7692b787f36eb67':
Doc change: fix typo in tablet guidelines.
2013-04-24 19:48:49 -07:00
Dirk Dougherty
c9f01f0a80
am 4a22f9a7: am 2a31f996: am bdf19c62: am 29743661: Doc change: fix typo in tablet guidelines.
...
* commit '4a22f9a7bb782d7b9aeb432b6fefda20057b8e11':
Doc change: fix typo in tablet guidelines.
2013-04-24 19:46:16 -07:00
Dirk Dougherty
4a22f9a7bb
am 2a31f996: am bdf19c62: am 29743661: Doc change: fix typo in tablet guidelines.
...
* commit '2a31f99680ec8bbf9acde86da5e7a595a9e4c089':
Doc change: fix typo in tablet guidelines.
2013-04-24 19:44:20 -07:00
Dirk Dougherty
2a31f99680
am bdf19c62: am 29743661: Doc change: fix typo in tablet guidelines.
...
* commit 'bdf19c62d841163f5c3434f3533e003f58816e0e':
Doc change: fix typo in tablet guidelines.
2013-04-24 19:42:49 -07:00
Dirk Dougherty
bdf19c62d8
am 29743661: Doc change: fix typo in tablet guidelines.
...
* commit '29743661734d8e2b7b3c33e635557c3f2ef9d8a0':
Doc change: fix typo in tablet guidelines.
2013-04-24 19:40:02 -07:00
Dirk Dougherty
2974366173
Doc change: fix typo in tablet guidelines.
...
Change-Id: I8e947fd20783ed12d46807733c4a87ba61211e41
2013-04-24 19:33:46 -07:00
Svetoslav
a424bc8058
am c91d4dfe: am e00b297c: Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev
...
* commit 'c91d4dfe0a243f9f1d53bb4dbd435759da5202fd':
The touch exploration capability is dynamically granted pre-JellyBeanMR2.
2013-04-24 18:51:40 -07:00
Svetoslav
c91d4dfe0a
am e00b297c: Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev
...
* commit 'e00b297c0b220148930d40d76f518cf51aa2c9ef':
The touch exploration capability is dynamically granted pre-JellyBeanMR2.
2013-04-24 18:49:23 -07:00
Matthew Xie
283537d5d2
am b0225f41: am a6631f57: Merge "Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN" into jb-mr2-dev
...
* commit 'b0225f41da77ebe7ebfccb6166021d324b4d6512':
Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN
2013-04-24 18:48:16 -07:00
Matthew Xie
b0225f41da
am a6631f57: Merge "Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN" into jb-mr2-dev
...
* commit 'a6631f57fa49c00d722f6d521b9882781be6dfa0':
Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN
2013-04-24 18:46:00 -07:00
Svetoslav
e00b297c0b
Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev
2013-04-25 01:44:43 +00:00
Matthew Xie
a6631f57fa
Merge "Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN" into jb-mr2-dev
2013-04-25 01:42:14 +00:00
Matthew Xie
d575233c53
Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN
...
bug 8667898
Change-Id: Iaff19fe72b16a96a6cf2f5b9140e369098567d2b
2013-04-24 17:51:37 -07:00
Chet Haase
59b095df72
Merge "Give animators more useful names in systrace"
2013-04-24 23:58:05 +00:00
Craig Mautner
19cdeaf8cf
Merge "Fix startActivityAndWait bugs"
2013-04-24 23:49:55 +00:00
Chet Haase
fdd3ad7018
Give animators more useful names in systrace
...
Also, fix ObjectAnimator.getPropertyName() to return useful info
for ObjectAnimators not created with string-based property names.
Change-Id: If7ab6dbcc3be13f5978840b02f4a91ef7eee1c50
2013-04-24 16:49:12 -07:00
Craig Mautner
c64f73e778
Fix startActivityAndWait bugs
...
- Send timeout message with a delay. The delay got lost when moving
from ActivityStack to ActivityStackSupervisor. Fixes bug 8687083.
- Remove waiting activities from list after they have been awoken.
Previously the list just got bigger and bigger.
Change-Id: Icb9e394db1eefa444e58c5416472017cac32298c
2013-04-24 16:44:56 -07:00
Kristian Monsen
62cadf153f
Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B
...
Catching all excptions from reading from the AssetManager
Change-Id: I53f99484deda3778307eab2ae86ca9fc0ad2fead
2013-04-24 16:41:24 -07:00
kmccormick
fd63af2d78
am ad6ff205: am 78cfd3cc: am 036cb2e4: (-s ours) am 3e06ca57: am 7b5d34f0: am 2a4ea0fc: am fd61958f: Doc Update: bug fix in SensorEvent ref
...
* commit 'ad6ff205afc24889f650105f23397e0af9e65e4f':
Doc Update: bug fix in SensorEvent ref
2013-04-24 16:25:49 -07:00
kmccormick
ad6ff205af
am 78cfd3cc: am 036cb2e4: (-s ours) am 3e06ca57: am 7b5d34f0: am 2a4ea0fc: am fd61958f: Doc Update: bug fix in SensorEvent ref
...
* commit '78cfd3cc432e8660cb23619b354a418a7a26f4b0':
Doc Update: bug fix in SensorEvent ref
2013-04-24 16:23:33 -07:00
kmccormick
78cfd3cc43
am 036cb2e4: (-s ours) am 3e06ca57: am 7b5d34f0: am 2a4ea0fc: am fd61958f: Doc Update: bug fix in SensorEvent ref
...
* commit '036cb2e4bf4bca4d32aa021fb5bb748684317043':
Doc Update: bug fix in SensorEvent ref
2013-04-24 16:19:14 -07:00
kmccormick
036cb2e4bf
am 3e06ca57: am 7b5d34f0: am 2a4ea0fc: am fd61958f: Doc Update: bug fix in SensorEvent ref
...
* commit '3e06ca574270b146b833a4f00eae82578e9cc115':
Doc Update: bug fix in SensorEvent ref
2013-04-24 16:02:26 -07:00
kmccormick
3e06ca5742
am 7b5d34f0: am 2a4ea0fc: am fd61958f: Doc Update: bug fix in SensorEvent ref
...
* commit '7b5d34f0a7b2d3e059a9f410a60367ef379fc502':
Doc Update: bug fix in SensorEvent ref
2013-04-24 16:00:21 -07:00
kmccormick
7b5d34f0a7
am 2a4ea0fc: am fd61958f: Doc Update: bug fix in SensorEvent ref
...
* commit '2a4ea0fc0d93bb94b1ff7e731af519cc41ef77e8':
Doc Update: bug fix in SensorEvent ref
2013-04-24 15:59:05 -07:00
kmccormick
2a4ea0fc0d
am fd61958f: Doc Update: bug fix in SensorEvent ref
...
* commit 'fd61958f75212a70bffebd79ad0876b7ad785f55':
Doc Update: bug fix in SensorEvent ref
2013-04-24 15:57:25 -07:00
kmccormick
fd61958f75
Doc Update: bug fix in SensorEvent ref
...
"Bug: 6349093"
Change-Id: Ibd4911b6c3f17fd2cd18042665efa428231c61ab
2013-04-24 15:52:44 -07:00
Craig Mautner
6de39ee1e7
Merge "Pause activities when leaving."
2013-04-24 22:36:50 +00:00
Craig Mautner
eb95786fd3
Pause activities when leaving.
...
Missed a spot where an activity that is launching another was not
being paused. Fixes bug 8640130. At least in one case.
Release mWindowMap as soon as it is no longer needed.
Change-Id: Id2c63d3d715b98741e2ebe3c9985cb1e9ca5ffbc
2013-04-24 15:34:32 -07:00
Igor Murashkin
f640bb9bbb
Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED
...
This system-only permission allows a service to disable the transmit LED
when a camera is in use.
Bug: 8554573
Change-Id: I64f7e3fcdc8ded8be3904650bd0c91d3b8f10dd4
2013-04-24 15:08:12 -07:00
Chet Haase
490d0c4468
am 6b4d0f21: am 42689769: Merge "Document behavior and usage of ViewGroup.bringChildToFront()" into jb-mr2-dev
...
* commit '6b4d0f21109209f1390125f301f20aa32e83b91a':
Document behavior and usage of ViewGroup.bringChildToFront()
2013-04-24 15:01:01 -07:00
Svetoslav
11adf6dc24
The touch exploration capability is dynamically granted pre-JellyBeanMR2.
...
Since the enable touch exploration capability is dynamically granted by
the user for apps targeting pre-JellybeanMR2 API level, we have to properly
update the accessibility service info for that service and also avoid
caching copies of the service info.
bug:8633951
Change-Id: I83dd1c852706ec55d40cda7209ad842889fb970a
2013-04-24 14:59:04 -07:00
Chet Haase
6b4d0f2110
am 42689769: Merge "Document behavior and usage of ViewGroup.bringChildToFront()" into jb-mr2-dev
...
* commit '4268976929979ffcc54122f8090c39a8c6799273':
Document behavior and usage of ViewGroup.bringChildToFront()
2013-04-24 14:58:38 -07:00
Amith Yamasani
04ed017e57
am 26c41f35: am cc841829: Merge "Rename limited user to restricted profile" into jb-mr2-dev
...
* commit '26c41f35058053292e3fe2fac14119b4183672bd':
Rename limited user to restricted profile
2013-04-24 14:57:32 -07:00