OSDN Git Service
Chris Craik [Wed, 24 Apr 2013 17:44:46 +0000 (17:44 +0000)]
Merge "Avoid incorrectly dirtying the functor output rect"
Craig Mautner [Wed, 24 Apr 2013 14:53:51 +0000 (14:53 +0000)]
Merge "Fix user switching."
Alex Klyubin [Wed, 24 Apr 2013 06:49:14 +0000 (23:49 -0700)]
am
50289346: am
a6436526: Merge "Human-readable POSIX capabilities for SystemServer."
* commit '
50289346b3010e24b6a7b86a774d88b81fc28f3b':
Human-readable POSIX capabilities for SystemServer.
Alex Klyubin [Wed, 24 Apr 2013 06:46:25 +0000 (23:46 -0700)]
am
a6436526: Merge "Human-readable POSIX capabilities for SystemServer."
* commit '
a643652680486bd1009248d1bd8fcea7da92d661':
Human-readable POSIX capabilities for SystemServer.
Alex Klyubin [Wed, 24 Apr 2013 05:54:46 +0000 (05:54 +0000)]
Merge "Human-readable POSIX capabilities for SystemServer."
Craig Mautner [Wed, 24 Apr 2013 02:36:43 +0000 (02:36 +0000)]
Merge "Add tap detector for switching stack focus."
Craig Mautner [Wed, 24 Apr 2013 00:08:34 +0000 (17:08 -0700)]
Fix user switching.
- Save and restore WindowManager stack states.
- Maintain ActivityManager activity states based on the stack
the activity is in.
Fixes bug
8646641.
Change-Id: I16c76c7708ab49121c3884a7e5bf219898b92d3f
Craig Mautner [Tue, 23 Apr 2013 18:23:27 +0000 (11:23 -0700)]
Add tap detector for switching stack focus.
- New InputEventReceiver for detecting taps outside of focused stack
boundaries.
- Fixed bug that wasn't pausing the non-focused window when returning
home.
Change-Id: Ia51d312a7c029abc01eb5df1102814cc29d33b47
Jim Miller [Wed, 24 Apr 2013 01:46:57 +0000 (18:46 -0700)]
Jim Miller [Wed, 24 Apr 2013 01:44:50 +0000 (18:44 -0700)]
Jim Miller [Wed, 24 Apr 2013 01:34:46 +0000 (18:34 -0700)]
Fix the build.
This fixes a bad merge in LockSettingsService.
Change-Id: I941bae77446dd0e94f409f0d64330ca5391f8efa
Svetoslav [Wed, 24 Apr 2013 01:08:55 +0000 (18:08 -0700)]
am
939ff0ac: am
4c783066: Merge "Fixing bugs exposed when moving accessibility CTS tests to UiAutomation." into jb-mr2-dev
* commit '
939ff0acff8a21a023d79214130680a66214840f':
Fixing bugs exposed when moving accessibility CTS tests to UiAutomation.
Jim Miller [Wed, 24 Apr 2013 01:08:53 +0000 (18:08 -0700)]
am
035f82b3: am
952b3102: Merge "Fix bug where owner info wasn\'t being updated properly." into jb-mr2-dev
* commit '
035f82b3a7a3517d97a7267f7f6d6b723b8b7e43':
Fix bug where owner info wasn't being updated properly.
Svetoslav [Wed, 24 Apr 2013 01:07:04 +0000 (18:07 -0700)]
am
4c783066: Merge "Fixing bugs exposed when moving accessibility CTS tests to UiAutomation." into jb-mr2-dev
* commit '
4c78306617dd67b92fdf19101c5dfde4e21172d9':
Fixing bugs exposed when moving accessibility CTS tests to UiAutomation.
Jim Miller [Wed, 24 Apr 2013 01:07:02 +0000 (18:07 -0700)]
am
952b3102: Merge "Fix bug where owner info wasn\'t being updated properly." into jb-mr2-dev
* commit '
952b310280954fbe187be8464a6fa50abd19a990':
Fix bug where owner info wasn't being updated properly.
Svetoslav [Wed, 24 Apr 2013 01:05:38 +0000 (01:05 +0000)]
Merge "Fixing bugs exposed when moving accessibility CTS tests to UiAutomation." into jb-mr2-dev
Jim Miller [Wed, 24 Apr 2013 01:04:10 +0000 (01:04 +0000)]
Merge "Fix bug where owner info wasn't being updated properly." into jb-mr2-dev
Svetoslav [Tue, 23 Apr 2013 01:34:02 +0000 (18:34 -0700)]
Fixing bugs exposed when moving accessibility CTS tests to UiAutomation.
1. UiAutomation#executeAndWaitForEvent method was invoking the passed
runnable while holding the lock which may lead to a deadlock. For
example: a runnable that calls getActivity() gets us into a state
like this.
2. UI automation services did not get all capabilities such a
service can have. Now a UI test service gets all of them.
3. When UiAutomation was exiting for event fired as a result of a
performed action, it was checking whether the received evnet time
is strictly before the time of executing the command that should
fire the event. However, if the execution is fast enough, i.e.
less than one millisecond, then the event time and the execution
time are the same. This was leading to a missed signal in rare
cases.
4. AccessibilityNodeInfoCache was not clearing the relevant state
for accessibility focus clearing event.
5. Accessibility text traversal in TextView was partially using text
and partially content description - broken. Now we are using the
text since for text view and content desc for other views. In other
words, we are using the most precise text we have.
6. AccessibilityManagerService was not granting capabilities of a
UiAutomation service - plainly wrong.
CTS change:https://googleplex-android-review.googlesource.com/#/c/300693/
bug:
8695422
bug:
8657560
Change-Id: I9afc5c3c69eb51f1c01930959232f44681b15e86
Jim Miller [Tue, 23 Apr 2013 00:17:03 +0000 (17:17 -0700)]
Fix bug where owner info wasn't being updated properly.
There was a bug where older platforms only stored the 'enabled'
value if the checkbox in Settings was toggled at least once. This
caused the checkbox to be checked off when upgrading the device.
The code now mimicks the old behavior by detecting a non-empty
info string and setting 'enabled' appropriately.
Fixes bug
8659048
Change-Id: If2431d54f168a0aab286628165dd3f6b4a0d5cf8
Nick Kralevich [Wed, 24 Apr 2013 00:08:31 +0000 (17:08 -0700)]
am
fc8bd4d3: am
35587a0c: Merge "Don\'t set ADDR_COMPAT_LAYOUT on the emulator"
* commit '
fc8bd4d3f4deece8beee7ce3f7888078dd37c60d':
Don't set ADDR_COMPAT_LAYOUT on the emulator
Nick Kralevich [Wed, 24 Apr 2013 00:06:58 +0000 (17:06 -0700)]
am
35587a0c: Merge "Don\'t set ADDR_COMPAT_LAYOUT on the emulator"
* commit '
35587a0c47c33a8eed7817dc705dbf502f7b5b60':
Don't set ADDR_COMPAT_LAYOUT on the emulator
Michael Wright [Tue, 23 Apr 2013 23:44:05 +0000 (16:44 -0700)]
am
2ea5aebe: am
51f7ca45: Merge "Fix keylayouts to use BACK instead of incorrect BUTTON_BACK." into jb-mr2-dev
* commit '
2ea5aebe59b72c034b32c132c35a5c75a7a2bf56':
Fix keylayouts to use BACK instead of incorrect BUTTON_BACK.
Michael Wright [Tue, 23 Apr 2013 23:42:13 +0000 (16:42 -0700)]
am
51f7ca45: Merge "Fix keylayouts to use BACK instead of incorrect BUTTON_BACK." into jb-mr2-dev
* commit '
51f7ca4521c3508a233eefe97f53092213eacb60':
Fix keylayouts to use BACK instead of incorrect BUTTON_BACK.
Michael Wright [Tue, 23 Apr 2013 23:39:01 +0000 (23:39 +0000)]
Merge "Fix keylayouts to use BACK instead of incorrect BUTTON_BACK." into jb-mr2-dev
Nick Kralevich [Tue, 23 Apr 2013 23:33:52 +0000 (23:33 +0000)]
Merge "Don't set ADDR_COMPAT_LAYOUT on the emulator"
Philip Milne [Tue, 23 Apr 2013 23:15:57 +0000 (16:15 -0700)]
am
6edbfb9c: am
a6d5109d: Merge "Fix for bug
8578258." into jb-mr2-dev
* commit '
6edbfb9cdc4d3a83d424565371e78dcdb9a0bb30':
Fix for bug
8578258.
Philip Milne [Tue, 23 Apr 2013 23:13:18 +0000 (16:13 -0700)]
am
a6d5109d: Merge "Fix for bug
8578258." into jb-mr2-dev
* commit '
a6d5109dd69791ba51e469c30d522dc27ab2c69c':
Fix for bug
8578258.
Philip Milne [Tue, 23 Apr 2013 23:11:06 +0000 (23:11 +0000)]
Merge "Fix for bug
8578258." into jb-mr2-dev
Matthew Xie [Tue, 23 Apr 2013 22:54:55 +0000 (15:54 -0700)]
am
2e0a94d2: am
b442d074: Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-dev
* commit '
2e0a94d22b1bd25c4fa9442e03c596bd0cb3fe76':
Add hardware feature android.hardware.bluetooth.le
Michael Wright [Tue, 23 Apr 2013 21:46:07 +0000 (14:46 -0700)]
Fix keylayouts to use BACK instead of incorrect BUTTON_BACK.
Fix duplicate keys in a couple of the onza controllers. Also, add them to the
Makefile so they actually get included in the build.
Bug:
8292749
Change-Id: I8246155f84d0c3c75b21e37fb579227fda76e197
Matthew Xie [Tue, 23 Apr 2013 22:52:53 +0000 (15:52 -0700)]
am
b442d074: Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-dev
* commit '
b442d07469aebc07d1d13b5b64b40aa152022e13':
Add hardware feature android.hardware.bluetooth.le
Matthew Xie [Tue, 23 Apr 2013 22:47:51 +0000 (22:47 +0000)]
Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-dev
Nick Kralevich [Tue, 23 Apr 2013 22:30:45 +0000 (15:30 -0700)]
Don't set ADDR_COMPAT_LAYOUT on the emulator
Don't work around third party app bugs on the emulator.
Change-Id: I4440fcd56b72e3a74881ddec2a469f037a060525
Philip Milne [Tue, 23 Apr 2013 21:31:23 +0000 (14:31 -0700)]
Fix for bug
8578258.
The fix in:
https://googleplex-android-review.googlesource.com/#/c/300346/
worked but the constant used had an extra trailing zero - which was confusing
and put a 1 in the 'flag' space of the measurement spec.
The intended number was:
0x00800000
Unfortunately, this intended constant doesn't fix this bug.
The constant submitted in this fix is:
0x00010000
which is outside the 'flag' space of measurement specs and appears to steer clear of overflow
problems in the scenario of this bug.
As suggested in the submission above, it would be preferable to rework of the RTL code to avoid
the use of such a constant as it seems very unlikely indeed that any choice of integer can
avoid problems in all cases.
Change-Id: I0c6744257ef2aebe8dbc8c041a447f9b90ee4b84
Irfan Sheriff [Tue, 23 Apr 2013 22:07:03 +0000 (15:07 -0700)]
am
ef8dc882: am
0aea616a: Merge "Keep device state always updated" into jb-mr2-dev
* commit '
ef8dc882ec235310737eead979fe913a8ab3465c':
Keep device state always updated
Raph Levien [Tue, 23 Apr 2013 22:02:04 +0000 (15:02 -0700)]
am
fdd40823: am
22a3344c: Merge "Fix for bug
8695466 GPOS combining mark positioning broken before space" into jb-mr2-dev
* commit '
fdd408233db5bd70cb43ddf2a49a85bd748da5b9':
Fix for bug
8695466 GPOS combining mark positioning broken before space
Scott Main [Tue, 23 Apr 2013 22:01:57 +0000 (15:01 -0700)]
am
4d4eb732: am
89a60814: am
2dd874ac: am
e0445881: am
51a452a9: am
4af72165: am
7653fbee: make Google IO image clickable
* commit '
4d4eb732ec0c21227284a70f9a718008b7f6995e':
make Google IO image clickable
Selim Gurun [Tue, 23 Apr 2013 22:01:54 +0000 (15:01 -0700)]
am
cf633a4c: am
6981f11f: am
2253105c: am
cab09cfc: am
dc9efbbb: am
a5f4e79f: am
22a946d3: am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
cf633a4c45b344ccb3f844afc6f6e0883cc5db83':
DO NOT MERGE Fix issues during backport
Ian Rogers [Tue, 23 Apr 2013 22:01:50 +0000 (15:01 -0700)]
am
4d355c39: am
282a7e1b: Adding matching @deprecated.
* commit '
4d355c39a7c2bacdcfbbb1691e5d0b28362c4e9c':
Adding matching @deprecated.
Ian Rogers [Tue, 23 Apr 2013 22:01:30 +0000 (15:01 -0700)]
am
896ee5b6: am
be4536d2: Merge "Adding matching @deprecated."
* commit '
896ee5b6f8354567464a371025088156ed49bc32':
Adding matching @deprecated.
Irfan Sheriff [Tue, 23 Apr 2013 21:59:58 +0000 (14:59 -0700)]
am
0aea616a: Merge "Keep device state always updated" into jb-mr2-dev
* commit '
0aea616acdb228b7a8c061977c0445174f60a1e1':
Keep device state always updated
Irfan Sheriff [Tue, 23 Apr 2013 21:57:53 +0000 (21:57 +0000)]
Merge "Keep device state always updated" into jb-mr2-dev
Raph Levien [Tue, 23 Apr 2013 21:21:44 +0000 (14:21 -0700)]
am
22a3344c: Merge "Fix for bug
8695466 GPOS combining mark positioning broken before space" into jb-mr2-dev
* commit '
22a3344cda1a3dcf4f719e0685c5d06155922c29':
Fix for bug
8695466 GPOS combining mark positioning broken before space
Raph Levien [Tue, 23 Apr 2013 21:19:19 +0000 (21:19 +0000)]
Merge "Fix for bug
8695466 GPOS combining mark positioning broken before space" into jb-mr2-dev
Irfan Sheriff [Tue, 23 Apr 2013 20:43:43 +0000 (13:43 -0700)]
Keep device state always updated
Tasker app showed up a bug where we can be out of sync with screen state
if we only received broadcasts when wifi is toggled on. Always receive
updates.
Bug:
8689583
Change-Id: Iad457c9768ed421765adb6a15d5f42ecf682da38
Raph Levien [Tue, 23 Apr 2013 19:42:16 +0000 (12:42 -0700)]
Fix for bug
8695466 GPOS combining mark positioning broken before space
This patch makes segmentation into script runs behave the same in RTL
as in LTR modes - so that inherited script characters are always
associated with the preceding run. Otherwise, for a sequence such as
u+0631 u+064d u+0020, it would get split after the first character,
which would lose the ability to correctly position the u+064d mark.
Change-Id: I3c12ba1b77d18334f55e707f518be1046e6b339b
Scott Main [Tue, 23 Apr 2013 19:43:57 +0000 (12:43 -0700)]
am
89a60814: am
2dd874ac: am
e0445881: am
51a452a9: am
4af72165: am
7653fbee: make Google IO image clickable
* commit '
89a6081447fc5c454aad3aea02190a576d92ca1b':
make Google IO image clickable
Scott Main [Tue, 23 Apr 2013 19:41:40 +0000 (12:41 -0700)]
am
2dd874ac: am
e0445881: am
51a452a9: am
4af72165: am
7653fbee: make Google IO image clickable
* commit '
2dd874ace63566892a58f43bcf15399ae66c8d4b':
make Google IO image clickable
Scott Main [Tue, 23 Apr 2013 19:39:18 +0000 (12:39 -0700)]
am
e0445881: am
51a452a9: am
4af72165: am
7653fbee: make Google IO image clickable
* commit '
e04458816b296ea76fc16cf8a820969cf363051d':
make Google IO image clickable
Scott Main [Tue, 23 Apr 2013 19:37:35 +0000 (12:37 -0700)]
am
51a452a9: am
4af72165: am
7653fbee: make Google IO image clickable
* commit '
51a452a93bb170a65921aae9ae6bddbf8ce12bff':
make Google IO image clickable
Scott Main [Tue, 23 Apr 2013 19:36:26 +0000 (12:36 -0700)]
am
4af72165: am
7653fbee: make Google IO image clickable
* commit '
4af72165092fb965ec9a97599f25538aa70242b1':
make Google IO image clickable
Scott Main [Tue, 23 Apr 2013 19:34:30 +0000 (12:34 -0700)]
am
7653fbee: make Google IO image clickable
* commit '
7653fbee7e4eb5d25a5b561b8142bd1af8c2cd58':
make Google IO image clickable
Scott Main [Tue, 23 Apr 2013 19:32:24 +0000 (12:32 -0700)]
make Google IO image clickable
Change-Id: I8638012fa6be1f104f20cf2f4dcea59787fdfd08
Selim Gurun [Tue, 23 Apr 2013 19:31:20 +0000 (12:31 -0700)]
am
6981f11f: am
2253105c: am
cab09cfc: am
dc9efbbb: am
a5f4e79f: am
22a946d3: am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
6981f11f3080eaa4a6590005ad464474b0fc1a18':
DO NOT MERGE Fix issues during backport
Selim Gurun [Tue, 23 Apr 2013 19:27:03 +0000 (12:27 -0700)]
am
2253105c: am
cab09cfc: am
dc9efbbb: am
a5f4e79f: am
22a946d3: am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
2253105c1ad6c93880b3ce1651cf54269711cff7':
DO NOT MERGE Fix issues during backport
Selim Gurun [Tue, 23 Apr 2013 19:24:37 +0000 (12:24 -0700)]
am
cab09cfc: am
dc9efbbb: am
a5f4e79f: am
22a946d3: am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
cab09cfc7afb7e19698bed3d61fe0b200dad3e4a':
DO NOT MERGE Fix issues during backport
Selim Gurun [Tue, 23 Apr 2013 19:23:14 +0000 (12:23 -0700)]
am
dc9efbbb: am
a5f4e79f: am
22a946d3: am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
dc9efbbb61a3e8da86c3e28f05d625a721a957fc':
DO NOT MERGE Fix issues during backport
Selim Gurun [Tue, 23 Apr 2013 19:21:49 +0000 (12:21 -0700)]
am
a5f4e79f: am
22a946d3: am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
a5f4e79fad39b4a0f91673c5813b1740e82144f4':
DO NOT MERGE Fix issues during backport
Selim Gurun [Tue, 23 Apr 2013 19:20:53 +0000 (12:20 -0700)]
am
22a946d3: am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
22a946d36af4ea69956531c89f0d0852497c3892':
DO NOT MERGE Fix issues during backport
Selim Gurun [Tue, 23 Apr 2013 19:18:47 +0000 (12:18 -0700)]
am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
006119bf2cd0b7f0ea3d1b6b0bbbfd413262504a':
DO NOT MERGE Fix issues during backport
Ian Rogers [Tue, 23 Apr 2013 19:04:25 +0000 (12:04 -0700)]
am
282a7e1b: Adding matching @deprecated.
* commit '
282a7e1b1db121c910f25b13081242a8c7611708':
Adding matching @deprecated.
Matthew Xie [Thu, 18 Apr 2013 22:25:59 +0000 (15:25 -0700)]
Add hardware feature android.hardware.bluetooth.le
The feature is used to differ platforms that support bluetooth low
engery radio
bug
8369273
Change-Id: Ibe23da73f7ecfa854bdb8b8bfc1a32b8e3aeee56
Ian Rogers [Fri, 19 Apr 2013 18:31:48 +0000 (11:31 -0700)]
Adding matching @deprecated.
Bug:
8657266
(Cherry-pick of
c2a3adbd56e763ef0ad045fd8c58a54e41d1639d)
Change-Id: Idbd22dc647f11441d15da12eb23723539768cf4c
Selim Gurun [Tue, 23 Apr 2013 18:08:37 +0000 (11:08 -0700)]
Merge commit '
8237dd82' into manualmerge
Bug:
6923539
Skipping the change. We already fixed this in master and jb-mr2-dev
in sha:
2905e18b03c6ce34739bed9c06b865b29087deea. A compatible change
was submitted to jb-dev (and so automerged to jb-mr1-dev). see sha
7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6. The conflict occurs while
merging
8237dd82bf151cb102a69243f91832be1c1294e4 which I thought was
DO NOT MERGE anyway.
Change-Id: If96e368d2e2cec98bc18069151a2ff861b53608f
Chet Haase [Tue, 23 Apr 2013 18:16:25 +0000 (11:16 -0700)]
am
393abb1c: am
5e650cef: Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-dev
* commit '
393abb1c54c6b847b81e2390efcd6ec95e8237f8':
Expand invalidation rectangle when clipChildren == false
Jean-Michel Trivi [Tue, 23 Apr 2013 18:16:22 +0000 (11:16 -0700)]
am
448c6ca4: am
ea236f19: Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev
* commit '
448c6ca48144b324ca1e98962bd5dd06451a355e':
Identify in logs launch of voice search from key events
Daniel Sandler [Tue, 23 Apr 2013 18:16:19 +0000 (11:16 -0700)]
am
2fd0ba8e: am
f78ff07f: Merge "Fix concurrency issues when parceling StatusBarNotifications." into jb-mr2-dev
* commit '
2fd0ba8e9529780fd87b71a024edb3200ad1d93a':
Fix concurrency issues when parceling StatusBarNotifications.
Amith Yamasani [Tue, 23 Apr 2013 18:16:16 +0000 (11:16 -0700)]
am
b2daf811: am
d52f2b14: Merge "Listen for brightness dialog broadcasts from all users" into jb-mr2-dev
* commit '
b2daf811cb39e8e38a31065c7ffb11d0926ffcef':
Listen for brightness dialog broadcasts from all users
Dirk Dougherty [Tue, 23 Apr 2013 18:16:14 +0000 (11:16 -0700)]
am
5fbf40b1: am
94aa1167: am
80177e0c: am
c2340c4d: am
ecf55180: am
04f3b81a: am
c7523804: am
00cfba95: Doc change: update support urls.
* commit '
5fbf40b12863965d68a1759b639802c23c651235':
Doc change: update support urls.
Nick Pelly [Tue, 23 Apr 2013 18:16:11 +0000 (11:16 -0700)]
am
09e9e1a5: am
edced26f: Merge "Add ContentValues & CursorWindow to framework.aidl" into jb-mr2-dev
* commit '
09e9e1a5e7e3dd161b73f4254f239cab0410438a':
Add ContentValues & CursorWindow to framework.aidl
Michael Wright [Tue, 23 Apr 2013 18:16:08 +0000 (11:16 -0700)]
am
58500051: am
5fe6e4c4: Merge "Rewrite input handling for native applications" into jb-mr2-dev
* commit '
585000515faacc02736f920425ae6c323223ee58':
Rewrite input handling for native applications
Svetoslav [Tue, 23 Apr 2013 18:16:05 +0000 (11:16 -0700)]
am
7bf02d12: am
a61464d7: Merge "Making new node id APIs return strings." into jb-mr2-dev
* commit '
7bf02d1255e86becb225ba70ca3ea8b2af90c166':
Making new node id APIs return strings.
Jean-Michel Trivi [Tue, 23 Apr 2013 18:16:03 +0000 (11:16 -0700)]
am
cb315af3: am
fb0b6a81: Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" into jb-mr2-dev
* commit '
cb315af34be49859a0bfda6ee808550671a5e416':
Opt-in mechanism for RemoteControlClient position anti-drift check
Dianne Hackborn [Tue, 23 Apr 2013 17:56:23 +0000 (10:56 -0700)]
resolved conflicts for merge of
8c3cb811 to master
Change-Id: I1cd4186b6b2dcb3d1d7d21c346384dbcc6e6a8df
Ian Rogers [Tue, 23 Apr 2013 16:15:58 +0000 (09:15 -0700)]
am
be4536d2: Merge "Adding matching @deprecated."
* commit '
be4536d214eedc3d12b50f0f30b47bba773b8dbc':
Adding matching @deprecated.
Ian Rogers [Tue, 23 Apr 2013 15:13:04 +0000 (15:13 +0000)]
Merge "Adding matching @deprecated."
Philip Milne [Tue, 23 Apr 2013 11:46:31 +0000 (04:46 -0700)]
am
089a75be: am
a7b2625d: Merge "Fix for bug
8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev
* commit '
089a75be5e33e13071754a727902224b6db60168':
Fix for bug
8578258: GridLayout is forcing wrong width to TextView widgets
Chris Craik [Tue, 23 Apr 2013 11:46:28 +0000 (04:46 -0700)]
am
4837ea99: am
8d3f3c06: Merge "Expand hardware accel doc" into jb-mr2-dev
* commit '
4837ea99c46e792e5f4d55e895c63d415888f1b4':
Expand hardware accel doc
Robert Greenwalt [Tue, 23 Apr 2013 11:46:25 +0000 (04:46 -0700)]
am
f12afa99: am
d0202945: Merge "Listen for network disconnect." into jb-mr2-dev
* commit '
f12afa9913ac75af724d9700ff85dc68b1e0cd45':
Listen for network disconnect.
Dirk Dougherty [Tue, 23 Apr 2013 11:46:23 +0000 (04:46 -0700)]
am
afd80ab6: am
3acb320f: am
ab3b13eb: am
e5d47b39: am
cdfeb09d: am
10fc5e05: am
cca23552: am
974af93d: Doc change: update payment detail for merch account.
* commit '
afd80ab6a60e57011fa218c930bcfa8345c88a4e':
Doc change: update payment detail for merch account.
Christopher Tate [Tue, 23 Apr 2013 11:46:20 +0000 (04:46 -0700)]
am
4c6f2a54: am
7a4ddbaa: Merge "Don\'t attempt native crash reporting for persistent apps" into jb-mr2-dev
* commit '
4c6f2a54109c3f75deca1f2b43736dcd9c965768':
Don't attempt native crash reporting for persistent apps
kmccormick [Tue, 23 Apr 2013 11:46:17 +0000 (04:46 -0700)]
am
7fccb942: am
47cccbd0: am
f9a152d8: am
0415ea6a: am
2aca8dbe: am
b116885c: am
ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit '
7fccb94248514fc1037985330e6f4f0b0cc5ce3f':
Doc update: Fix firewall text.
Scott Main [Tue, 23 Apr 2013 11:46:15 +0000 (04:46 -0700)]
am
5ced567d: am
3fadd4c2: am
8841569f: am
b8ac12af: am
3da6ef39: am
d07bdb6f: am
2779da87: fix backup registration url external bug: 54539
* commit '
5ced567d768ae68796e017a2e1e5e72f7f22fef3':
fix backup registration url external bug: 54539
Baligh Uddin [Tue, 23 Apr 2013 11:46:12 +0000 (04:46 -0700)]
am
1aaef016: am
b0579834: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
1aaef016fade071b7bd61763bf4ffb5a2b853713':
Import translations. DO NOT MERGE
Dianne Hackborn [Tue, 23 Apr 2013 11:46:09 +0000 (04:46 -0700)]
am
e89dcf33: am
3edf207a: Merge "Assign final resource IDs for JB MR2." into jb-mr2-dev
* commit '
e89dcf33e12ee9d57636adf1ccc37aca44d3c311':
Assign final resource IDs for JB MR2.
Scott Main [Tue, 23 Apr 2013 11:46:06 +0000 (04:46 -0700)]
am
c87dd640: am
9753ef1e: am
35ac5b08: am
abb6f472: am
24a3899c: am
1aba107d: am
c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
* commit '
c87dd6409253b4dfdc90c9d4f053f4c508d8cdfa':
delete unused download page and add a couple search tags
Zhentao Sun [Tue, 23 Apr 2013 11:46:03 +0000 (04:46 -0700)]
am
04375db6: am
c5fc9988: Made it easier to disable overlay mechanism of location components.
* commit '
04375db65302fabcf7101ecc4e1e6e38700baba5':
Made it easier to disable overlay mechanism of location components.
Chet Haase [Tue, 23 Apr 2013 10:52:28 +0000 (03:52 -0700)]
am
5e650cef: Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-dev
* commit '
5e650cef53cf1eb33f9c8b2f8e5c8b1bb24b32d9':
Expand invalidation rectangle when clipChildren == false
Jean-Michel Trivi [Tue, 23 Apr 2013 10:52:12 +0000 (03:52 -0700)]
am
ea236f19: Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev
* commit '
ea236f19e652942a7af384566c70cdd0c7f88c58':
Identify in logs launch of voice search from key events
Daniel Sandler [Tue, 23 Apr 2013 10:52:06 +0000 (03:52 -0700)]
am
f78ff07f: Merge "Fix concurrency issues when parceling StatusBarNotifications." into jb-mr2-dev
* commit '
f78ff07f6e688d11881658f743ef63076fcc550c':
Fix concurrency issues when parceling StatusBarNotifications.
Amith Yamasani [Tue, 23 Apr 2013 10:52:04 +0000 (03:52 -0700)]
am
d52f2b14: Merge "Listen for brightness dialog broadcasts from all users" into jb-mr2-dev
* commit '
d52f2b14852c057fd8d94cebb7ddf8900ba1d232':
Listen for brightness dialog broadcasts from all users
Dirk Dougherty [Tue, 23 Apr 2013 10:51:58 +0000 (03:51 -0700)]
am
94aa1167: am
80177e0c: am
c2340c4d: am
ecf55180: am
04f3b81a: am
c7523804: am
00cfba95: Doc change: update support urls.
* commit '
94aa1167a20560d455cf9458349c081c45531393':
Doc change: update support urls.
Nick Pelly [Tue, 23 Apr 2013 10:51:56 +0000 (03:51 -0700)]
am
edced26f: Merge "Add ContentValues & CursorWindow to framework.aidl" into jb-mr2-dev
* commit '
edced26f162b0232338064e569fe651b8c805f93':
Add ContentValues & CursorWindow to framework.aidl
Michael Wright [Tue, 23 Apr 2013 10:51:53 +0000 (03:51 -0700)]
am
5fe6e4c4: Merge "Rewrite input handling for native applications" into jb-mr2-dev
* commit '
5fe6e4c4c9de523fa9e74902473996ce5ee8b298':
Rewrite input handling for native applications
Svetoslav [Tue, 23 Apr 2013 10:51:50 +0000 (03:51 -0700)]
am
a61464d7: Merge "Making new node id APIs return strings." into jb-mr2-dev
* commit '
a61464d7adc26c291a5f9de48c9aff8b76a56b1f':
Making new node id APIs return strings.
Jean-Michel Trivi [Tue, 23 Apr 2013 10:51:42 +0000 (03:51 -0700)]
am
fb0b6a81: Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" into jb-mr2-dev
* commit '
fb0b6a817903b42dfc192dc8fa71f5dede024379':
Opt-in mechanism for RemoteControlClient position anti-drift check
Dianne Hackborn [Tue, 23 Apr 2013 10:51:40 +0000 (03:51 -0700)]
am
a4629b0b: Merge "JB MR2 == API 18." into jb-mr2-dev
* commit '
a4629b0b833f78481ca51baa44b0303ebe647a7c':
JB MR2 == API 18.
Philip Milne [Tue, 23 Apr 2013 10:51:29 +0000 (03:51 -0700)]
am
a7b2625d: Merge "Fix for bug
8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev
* commit '
a7b2625d43a8e83e3fb47ca261efad6e3f6fcde9':
Fix for bug
8578258: GridLayout is forcing wrong width to TextView widgets
Chris Craik [Tue, 23 Apr 2013 10:51:18 +0000 (03:51 -0700)]
am
8d3f3c06: Merge "Expand hardware accel doc" into jb-mr2-dev
* commit '
8d3f3c061709eefe202e0ff7a612fcdf8cfeeb63':
Expand hardware accel doc
Robert Greenwalt [Tue, 23 Apr 2013 10:51:08 +0000 (03:51 -0700)]
am
d0202945: Merge "Listen for network disconnect." into jb-mr2-dev
* commit '
d020294572f591007de1fe0aa9e4927dae72c0c9':
Listen for network disconnect.
OSDN Git Service
