Claudia de Veaux
f512e46ae1
Merge "String scrub to implement punc, wording, cap standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328"
2011-10-24 15:35:34 -07:00
Jeff Brown
1328d1f8c8
Merge "Use libcorkscrew for stack unwinding."
2011-10-24 15:13:13 -07:00
Jim Miller
ba653c624e
am 7a962fef: Merge "Fix 3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0
...
* commit '7a962fef2f26b941b916595562d5adfae943d432':
Fix 3384942: Force ASCII-capable IME to show on lockscreen
2011-10-24 13:32:31 -07:00
Xavier Ducrohet
d3e3446a1f
am e869ca96: (-s ours) CherryPick f9e455 from master to mr0. do not merge.
...
* commit 'e869ca9626146265bbb2b5043018dfe532e0661f':
CherryPick f9e455 from master to mr0. do not merge.
2011-10-24 13:32:30 -07:00
Jim Miller
7a962fef2f
Merge "Fix 3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0
2011-10-24 13:31:15 -07:00
Xavier Ducrohet
e869ca9626
CherryPick f9e455 from master to mr0. do not merge.
...
Fix software GL renderer.
Change-Id: I7273a8e65c23a0032d155ea6572de2923791e411
2011-10-24 13:29:26 -07:00
Brian Colonna
4e23bf011e
am c9c417c8: Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0
...
* commit 'c9c417c85d08074e5ececd5c74db1364e9c097c2':
Added callback to allow Face Unlock to hide black area
2011-10-24 13:22:13 -07:00
Xavier Ducrohet
7784724597
am b0994ed7: (-s ours) CherryPick 35530d from master to mr0. do not merge.
...
* commit 'b0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee':
CherryPick 35530d from master to mr0. do not merge.
2011-10-24 13:20:07 -07:00
Brian Colonna
c9c417c85d
Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0
2011-10-24 13:19:55 -07:00
Xavier Ducrohet
b0994ed7ff
CherryPick 35530d from master to mr0. do not merge.
...
qemu.hw.mainkeys indicates if the device has h/w main (home/back) keys.
If it has main keys, then the navigation bar is *not* displayed.
Change-Id: Idb36a1f787360363a009463f0c016a423594a5b9
2011-10-24 13:15:58 -07:00
Xavier Ducrohet
852edd3576
Merge "qemu.hw.mainkeys indicates if the device has h/w main (home/back) keys."
2011-10-24 13:01:46 -07:00
Scott Main
46b2821b9f
am 084369fb: docs: add uiOptions attribute to manifest docs
...
* commit '084369fb5e738e4db6ae94b4e24e777bdd9d9c2c':
docs: add uiOptions attribute to manifest docs
2011-10-24 12:46:39 -07:00
Wink Saville
110b8a4cfe
am cd3ec73f: Add getAvailableNetworks.
...
* commit 'cd3ec73f0ce164c718146bc1dbb7c430763be25a':
Add getAvailableNetworks.
2011-10-24 12:46:21 -07:00
Brian Colonna
f8b9a4751e
Added callback to allow Face Unlock to hide black area
...
- Part of fix 5491362 (RelTeamHotIssue)
- Because the fix closes the camera early, this change is needed so
the black area isn't still hanging around while the camera fades
to the backup lock.
Change-Id: Iab7c264adab0fb05979fe2732048ccf2237e64c5
2011-10-24 15:37:53 -04:00
Xavier Ducrohet
35530d7787
qemu.hw.mainkeys indicates if the device has h/w main (home/back) keys.
...
If it has main keys, then the navigation bar is *not* displayed.
Change-Id: I0e99c1bfe1fcb7714e481524b4d0e1864bb1cb69
2011-10-24 12:27:53 -07:00
Svetoslav Ganov
bddc835436
Merge "Adding APIs to enable reporting virtual view hierarchies to accessibility serivces."
2011-10-24 12:05:38 -07:00
Scott Main
084369fb5e
docs: add uiOptions attribute to manifest docs
...
Change-Id: Ibe2960b6a4ee4e2d4a47e4acc7c197d68702d1e6
2011-10-24 11:38:29 -07:00
Wink Saville
cd3ec73f0c
Add getAvailableNetworks.
...
To allow a operator test to pass we need to manually select
a network. Therefore getAvailableNetworks needs to be implemented
on CDMALTEPhone so that RIL_REQUEST_QUERY_AVAILABLE_NETWORKS is
sent to the RIL/radio.
Bug: 5420630
Change-Id: I8e138b211d42755399a9e30f3e45dde2f579401e
2011-10-24 11:10:36 -07:00
Peter Ng
723fe12644
Merge "Stat notify image update"
2011-10-24 10:55:30 -07:00
The Android Open Source Project
3c5b65c95e
Reconcile with ics-mr0-release
...
Change-Id: I8530d709cfd162fdca2cb2d1b6a0bf1bc46b3f66
2011-10-24 06:32:19 -07:00
Jeff Brown
044966aef3
Use libcorkscrew for stack unwinding.
...
Change-Id: Iee1ee5a2018ab8cfc1ce12ec2a124809245eaa02
2011-10-22 15:44:12 -07:00
The Android Automerger
335978e729
merge in ics-mr0-release history after reset to ics-mr0
2011-10-21 23:22:41 -07:00
Claudia de Veaux
13a6ad89df
String scrub to implement punc, wording, cap standards.
...
Bugs: 5165745, 5163232, 5162668, 5162667, 5162328
Change-Id: Ia0417a00f236660134ca86f91a78c92dc94d4ed0
More edits after self-review.
2011-10-21 18:25:34 -07:00
Jake Hamby
3f06110dd0
Merge "Add support for SMS-PP data download to USIM."
2011-10-21 17:04:15 -07:00
Mathias Agopian
73182fc821
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 17:04:05 -07:00
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
Jake Hamby
ac09d2af14
Add support for SMS-PP data download to USIM.
...
Devices supporting IMS may receive SMS-PP data download messages
which are normally handled in the radio baseband. Add support to
framework for these messages, passing the data to the UICC and
sending the response data as part of the SMS ACK.
Change-Id: I1da76982c6f8c402f82a6f535591e614f4e0de18
2011-10-21 16:43:24 -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
The Android Automerger
cbbf026a43
merge in ics-mr0-release history after reset to ics-mr0
2011-10-21 15:55:40 -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
Peter Ng
11baab83d3
Stat notify image update
...
Change-Id: I39bd3df75f88ad0f39cdc24b29e9726e4ab9cf15
2011-10-21 15:24:17 -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