Peter Ng
cfb9df6710
am be25d5b0: (-s ours) Merge "Do not merge - Recents background protection increased" into ics-mr0
...
* commit 'be25d5b05639c8475b7faf312959923db86efa5d':
Do not merge - Recents background protection increased
2011-10-21 16:45:23 -07:00
Peter Ng
be25d5b056
Merge "Do not merge - Recents background protection increased" into ics-mr0
2011-10-21 16:42:49 -07:00
John Reck
b9c903fdfa
Merge "Fix rebuildWebTextView issues"
2011-10-21 16:35:50 -07:00
Xavier Ducrohet
2f4ce2ecd0
Merge "Fix software GL renderer."
2011-10-21 16:22:15 -07:00
Xavier Ducrohet
f9e4551367
Fix software GL renderer.
...
Change-Id: I07ab2709fa694e41aa3fcc5b9dfc809f55853ab4
2011-10-21 16:18:48 -07:00
Mathias Agopian
9ec98cd134
am aa938c8d: Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0
...
* commit 'aa938c8d9c0e71c9b556657cb33794210ce6ebf8':
mDirtyRegion is single threaded, but could be accessed from a hwc thread
2011-10-21 16:00:00 -07:00
Eric Fischer
1625b2af03
am 148d5bd8: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '148d5bd855e4872bbe99870b0019462bcf73b72c':
Import revised translations. DO NOT MERGE
2011-10-21 15:57:54 -07:00
Mathias Agopian
aa938c8d9c
Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0
2011-10-21 15:57:45 -07:00
Eric Fischer
148d5bd855
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-21 15:56:22 -07:00
Mathias Agopian
6497eabf0e
mDirtyRegion is single threaded, but could be accessed from a hwc thread
...
We now have mInvalidateRegion which holds the region to invalidate, it
can be set from any thread as long as mInvalidateLock is held. We use
fine-grained locking here because mInvalidateRegion can be set from anywhere,
in particular frmo HWC callbacks.
Bug: 5466774
Change-Id: Iafca20aa3f5b25a87755e65bde7b769aa8f997bc
2011-10-21 15:41:01 -07:00
Peter Ng
02d6fa5840
Do not merge - Recents background protection increased
...
Change-Id: I45719b44102c088c82b619c717db3df31930c1b3
2011-10-21 15:37:28 -07:00
John Reck
c0e9fb91c8
Fix rebuildWebTextView issues
...
Bug: 5488135
Cherry pick from MR0
Change-Id: I2df047b6de42dbe716008f69d720fa5fad3fe19d
2011-10-21 15:31:33 -07:00
Daniel Shiplacoff
6d93ea7495
Merge "Recents background protection increased"
2011-10-21 15:22:54 -07:00
John Reck
59cf1dd6ae
am 8bf89f30: (-s ours) Fix the build
...
* commit '8bf89f305eb3a2010b1a63048a4aa18ccbc42e78':
Fix the build
2011-10-21 15:22:11 -07:00
Adam Cohen
bd12e41ba5
am e3bb0ecb: Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0
...
* commit 'e3bb0ecb2b36964cb3b02bc0d575e9366818ee00':
Removing fades on last item in StackView for major FPS improvement on Prime
2011-10-21 14:38:41 -07:00
John Reck
a26f7f169e
am 2dd2e5b4: (-s ours) Merge changes I2df047b6,I791eeb3c into ics-mr0
...
* commit '2dd2e5b4eb95280bb18717c1a31ca8db40a6413b':
Fix rebuildWebTextView issues
DO NOT MERGE Fixed spell check failing to change word.
2011-10-21 14:38:32 -07:00
Dianne Hackborn
6ec96ec404
am 943da7b8: Merge "Fix issue #5342788 : Setting wallpaper from gallery set default..." into ics-mr0
...
* commit '943da7b895b7cc69cdaed7979cff422a7dbaac19':
Fix issue #5342788 : Setting wallpaper from gallery set default...
2011-10-21 14:38:31 -07:00
Eric Fischer
66358bbd3e
Import revised translations. DO NOT MERGE
...
Change-Id: Ia333fa4ab1d72588e9c9ae4a9ef069eccdc9b485
2011-10-21 14:36:36 -07:00
John Reck
8bf89f305e
Fix the build
...
Change-Id: I822f75b3ed29e7817c7bd9ac5e2314b43831d2c1
2011-10-21 14:24:31 -07:00
Dirk Dougherty
7543b65022
am f1ed59bc: Merge "Doc change: fix typo in platform highlights." into ics-mr0
...
* commit 'f1ed59bcebfd3042aead8d91ee47eca38af543c6':
Doc change: fix typo in platform highlights.
2011-10-21 13:59:34 -07:00
Winson Chung
19da321c9a
am 53a1b82c: Merge "Last update for screenshot animations for MR0. (Bug: 5333706)" into ics-mr0
...
* commit '53a1b82c9a2133c5c3184898335fce0826279691':
Last update for screenshot animations for MR0. (Bug: 5333706)
2011-10-21 13:59:08 -07:00
Dianne Hackborn
12b3e39ecb
am 4bbd71a6: Merge "Fix issue #5228934 : IME shows up on boot, or when digits screen is tapped" into ics-mr0
...
* commit '4bbd71a6b2f4957f4778da13861ec03d30afbee7':
Fix issue #5228934 : IME shows up on boot, or when digits screen is tapped
2011-10-21 13:59:07 -07:00
Mike Lockwood
186e21d8fb
am 6b6bfb18: Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0
...
* commit '6b6bfb187412e4845c89d866eff0b87b6d0a5541':
PowerManagerService: Enable light sensor debug output
2011-10-21 13:59:05 -07:00
Gilles Debunne
03d13e7fa9
am 0499f90a: Merge "Bug 5428541: Check that span is still in text before deleting" into ics-mr0
...
* commit '0499f90a2d2774f28ca3d430dfe563391669c515':
Bug 5428541: Check that span is still in text before deleting
2011-10-21 13:59:04 -07:00
Eric Fischer
0a79a2eaab
am 4e7ce935: (-s ours) Merge "Import revised translations." into ics-mr0
...
* commit '4e7ce9352b9c3a832715ac4b8014b2434a447172':
Import revised translations.
2011-10-21 13:59:03 -07:00
Adam Cohen
e3bb0ecb2b
Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0
2011-10-21 13:34:46 -07:00
Peter Ng
ab5040cf85
Merge "Sharpening text edit assets"
2011-10-21 13:29:52 -07:00
Peter Ng
3ed8933b12
Recents background protection increased
...
Change-Id: I45719b44102c088c82b619c717db3df31930c1b3
2011-10-21 13:29:16 -07:00
George Mount
930b5654a3
Merge "Fixed spell check failing to change word."
2011-10-21 13:02:05 -07:00
RoboErik
f9d89f388f
Merge "s/should/can"
2011-10-21 13:01:56 -07:00
John Reck
2dd2e5b4eb
Merge changes I2df047b6,I791eeb3c into ics-mr0
...
* changes:
Fix rebuildWebTextView issues
DO NOT MERGE Fixed spell check failing to change word.
2011-10-21 13:01:48 -07:00
Mangesh Ghiware
760bf7de06
Merge "Fix issue# 5492404: Reading level check thread error."
2011-10-21 12:45:30 -07:00
Dianne Hackborn
943da7b895
Merge "Fix issue #5342788 : Setting wallpaper from gallery set default..." into ics-mr0
2011-10-21 12:45:07 -07:00
Adam Cohen
c798b6688a
Removing fades on last item in StackView for major FPS improvement on Prime
...
Change-Id: I479eb129e80a6087ab55d1de7eed0222d6dacdf6
2011-10-21 12:44:13 -07:00
John Reck
e20bfd9b33
Fix rebuildWebTextView issues
...
Bug: 5488135
Change-Id: I2df047b6de42dbe716008f69d720fa5fad3fe19d
2011-10-21 12:39:43 -07:00
George Mount
da182deded
DO NOT MERGE Fixed spell check failing to change word.
...
Bug 5387838
On WebView.rebuildWebTextView, setTextAndKeepSelection was
being called, erasing the selections. Changed it so that
when text is replaced with the exact same value, no replace
is done. Also, on the Google search, when a spelling change
was made, the final character was placed improperly. When
a single character is added, the javascript events for the
character are sent. When multiple characters are changed,
the entire value is replaced with no javascript key events
sent.
Change-Id: I791eeb3c96354cfe3cbfda7e8d05c81fcdeb152f
2011-10-21 12:39:30 -07:00
Dianne Hackborn
3da318202f
Fix issue #5342788 : Setting wallpaper from gallery set default...
...
...wallpaper first time IRK81.
We were monitoring for file creates when those are not needed, and
receiving the initial file create was causing us to be confused.
Change-Id: Iccd3b7492c82895dba87f25c4881c538f300d342
2011-10-21 12:29:10 -07:00
Dirk Dougherty
f1ed59bceb
Merge "Doc change: fix typo in platform highlights." into ics-mr0
2011-10-21 11:55:21 -07:00
RoboErik
0c559c6c57
s/should/can
...
Change-Id: Id09d3bb21c952f4c4aaa98fbb2e334dda75b74a1
2011-10-21 11:20:51 -07:00
Dirk Dougherty
cdb2008f66
Doc change: fix typo in platform highlights.
...
Change-Id: I6df4128c79705f97f029ba7ed13c0ae3d5807f18
2011-10-21 11:13:47 -07:00
Winson Chung
53a1b82c9a
Merge "Last update for screenshot animations for MR0. (Bug: 5333706)" into ics-mr0
2011-10-21 11:07:06 -07:00
Dianne Hackborn
4bbd71a6b2
Merge "Fix issue #5228934 : IME shows up on boot, or when digits screen is tapped" into ics-mr0
2011-10-21 11:03:34 -07:00
RoboErik
2b41c2f38c
Merge "Color API comment updates."
2011-10-21 11:00:40 -07:00
Mangesh Ghiware
bb99e28cd6
Fix issue# 5492404: Reading level check thread error.
...
Remove access to WebSettings from getReadingLevelScale() by saving the
double-tap zoom scale factor in ZoomManager. WebSettings can only be
accessed in the UI thread.
Change-Id: Ic7289bf3c14d800797f2e85546a088a9071e0468
2011-10-21 10:53:29 -07:00
Mike Lockwood
6b6bfb1874
Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0
2011-10-21 10:26:55 -07:00
Gilles Debunne
0499f90a2d
Merge "Bug 5428541: Check that span is still in text before deleting" into ics-mr0
2011-10-21 09:48:07 -07:00
Eric Fischer
4e7ce9352b
Merge "Import revised translations." into ics-mr0
2011-10-21 09:34:22 -07:00
Mike Lockwood
22d12ab14c
PowerManagerService: Enable light sensor debug output
...
Bug: 5426212
Change-Id: I46ca01eee8d69f7bd6fc63e53506ba42c3fe537d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-21 09:05:05 -04:00
Kristian Monsen
43abfe1be2
Merge "WebView part of fix for bug 5307956"
2011-10-21 04:48:22 -07:00
Jake Hamby
a625e1fe10
Merge "Add wrapper classes for UICC service tables."
2011-10-21 00:49:41 -07:00