21469 Commits

Author SHA1 Message Date
Eric Fischer
64eecc0755 Import revised translations.
Change-Id: Ib8940867bc7a807284dbb1297b5856e352690850
2011-04-11 14:25:44 -07:00
Jason parks
f953d3e2ea am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread
* commit '7f506024e989c2c7dfa8f9f72ea088944e307c26':
  Implement teardown script.
2011-04-11 14:24:06 -07:00
Jeff Hamilton
a83bc16089 am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.
* commit '7bb236c3b5e49f53b3110855276d99e664b29931':
  Make the NFC UID forward compatible.
2011-04-11 14:23:59 -07:00
Amith Yamasani
beb182a494 Merge "Package manager changes to store and update user information." 2011-04-11 12:14:17 -07:00
Amith Yamasani
4b2e934928 Package manager changes to store and update user information.
Some API stubs for managing users and storing their details.
List of users is stored in an xml file.
Each user's properties are stored in a separate xml file.

Some unit tests for modifying the XML files.

Change-Id: If2ce2420723111bd426f6762def3c2afc19a0ae5
2011-04-11 12:12:58 -07:00
Wink Saville
37e344cbe2 am 1b00dc66: am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
* commit '1b00dc66d4b61b9a2bf44f76a9d3f54be91a2dbf':
  Move ProcessedMessage into HierarchicalStateMachine.
2011-04-11 12:11:14 -07:00
Wink Saville
1b00dc66d4 am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
* commit '3156a8c1694756dfa74c3918867f528bcf916e28':
  Move ProcessedMessage into HierarchicalStateMachine.
2011-04-11 12:08:19 -07:00
Wink Saville
3156a8c169 Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE 2011-04-11 12:04:47 -07:00
Wink Saville
d3059487ab Move ProcessedMessage into HierarchicalStateMachine.
ProcessedMessage is really private to HSM and so moving
it into the HSM class.

Change-Id: Ida476fc7aae5e9bfb6ac632dac979e11f489b6fc
2011-04-11 11:51:28 -07:00
Freeman Ng
8e0cc73919 am 2df36fd6: am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
* commit '2df36fd6ec39e096327032283d058b48be19e843':
  Add prepaid data services URL to Secure Settings
2011-04-11 11:30:21 -07:00
Freeman Ng
2df36fd6ec am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
* commit 'b7e8a54d98f753406c8763a7075e5f6b92e9300e':
  Add prepaid data services URL to Secure Settings
2011-04-11 11:19:18 -07:00
Freeman Ng
b7e8a54d98 Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE 2011-04-11 11:10:18 -07:00
Kenny Root
08d9d9a462 Merge "Runtime resource overlay, iteration 1." 2011-04-11 10:07:15 -07:00
Shachar Shemesh
0cd48ae3de Remove errant tag terminator
Element android.widget.QuickContactBadge had two closing markers.

Change-Id: I0ab47e2fc999b4cf09fa10a7f5df58090816e315
2011-04-11 13:48:35 +03:00
Dianne Hackborn
bcbab36843 Merge "Rework thumbnails in activity manager." 2011-04-08 18:28:14 -07:00
Dianne Hackborn
f26fd99a7c Rework thumbnails in activity manager.
We now only keep a thumbnail for the task, not for each
activity.  However if you use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET,
we will make a new secondary thumbnail for that series of
activities.  There is a new API for the app to get these
secondary thumbnails.

Also set a default thumbnail size for non-xlarge screens
so we have thumbnails on phones.  (We need some smarter
code in the platform for computing the actual thumbnail
dimensions of the current device).  And add a test app
to show recent tasks + thumbnails.

Change-Id: Ic36759f6635522118a2cb7f156662229a610c492
2011-04-08 18:16:21 -07:00
Xia Wang
dddfaa75e7 Fix access point parsing: reset static link property after parsing
static ip setting
Fix removeConfiguredNetwork: add sleep between remove configured network
and disable wifi

Change-Id: I619e79e9bc414b9aeae3537dbc642a7fbc9fca97
2011-04-08 16:31:01 -07:00
Elliott Hughes
dcd2ef9acc Merge "More JNI exception-throwing cleanup." 2011-04-08 16:15:26 -07:00
Brian Carlstrom
8d387d6cad Merge "Add keychain user with special keystore access permissions" 2011-04-08 15:40:06 -07:00
Elliott Hughes
69a017bc1d More JNI exception-throwing cleanup.
There are a few (unimportant) bug fixes here. There were several attempts to
throw exceptions in situations where there's already a pending exception.

There were also cases where the code was wrong; it was checking for a NULL
return from Get*ArrayElements and throwing NPE, but passing NULL is an error
that causes a crash and a NULL return means an exception has already been
thrown. I didn't want to get into the Scoped* classes just yet, but that
was by far the easiest way to fix this.

Change-Id: I0b31160ee51b96e82539f6514b8412b149dba7c3
2011-04-08 15:01:19 -07:00
Fabrice Di Meglio
0343a7eb6d Merge "TextLayoutCache - add glyphs caching" 2011-04-08 14:51:08 -07:00
Fabrice Di Meglio
fcf2be1846 TextLayoutCache - add glyphs caching
- cache glyphs after Harfbuzz shaping
- use "m" prefix for member variables
- add temporary API for drawing text with glyphs
- update BiDiTest app

Change-Id: I619b3f313b15f010018daad21b3e5e486619b4e4
2011-04-08 14:37:18 -07:00
Brian Carlstrom
8c2a1a90a8 Add keychain user with special keystore access permissions
Change-Id: I02fe5171add62c5cd9f57b01bc137f3bc1cb3a69
2011-04-08 14:06:39 -07:00
Gilles Debunne
daa4a95a54 Fix in BreakIterator.
An index equal to the length of text is indeed a valid position,
representing a cursor located after the last character.

Also changed iterator to comply to the documentation.

Change-Id: I7b9e427e4e37df20ab7e66d99053a9d8a6af6eb3
2011-04-08 11:33:23 -07:00
Brian Carlstrom
ceb889711f Merge "Tolerate missing AccountManager resource, not just missing resource name" 2011-04-08 10:28:34 -07:00
Elliott Hughes
fbb0788463 Merge "Use jniThrowException for exception throwing from native code." 2011-04-08 10:08:19 -07:00
Teng-Hui Zhu
cfa5ccfbc5 Merge "Don't send pause again when coming back from full screen" 2011-04-08 09:19:01 -07:00
Wu-cheng Li
0d15042b39 Merge "Add camera focus area API." 2011-04-08 02:47:39 -07:00
Wu-cheng Li
30771b7733 Add camera focus area API.
The API are still hidden.

bug:3475893

Change-Id: I92405c9e332b7fb141788cda7ebc9705dd666c67
2011-04-08 17:45:15 +08:00
satok
b3fc1a5b8b Rename CorrectionSpan to SuggestionSpan
Change-Id: I004b2e012b2de4de959a31da1f55b63ca7c14199
2011-04-08 13:43:19 +09:00
Joe Onorato
43a17654cf Remove the deprecated things from Config.java. These haven't been working since before 1.0.
Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e
2011-04-07 19:23:05 -07:00
Elliott Hughes
8451b25a44 Use jniThrowException for exception throwing from native code.
I'll do media and the generated gl stuff separately. Otherwise, this
cleans up all direct calls of ThrowNew/Throw except the one in the
binder that needs to remain.

Change-Id: I8f95a5f020f53b25926ad31ac0c9477ddf85d04b
2011-04-07 19:17:57 -07:00
Dianne Hackborn
bdf7b013f8 Merge "Improve activity manager debug dumps." 2011-04-07 18:46:54 -07:00
Dianne Hackborn
e17aeb3103 Improve activity manager debug dumps.
Activity manager now does all dump requests into apps
asynchronously, so it can nicely timeout if there is an
app problem.  Also lots of general cleanup of the am
dump output.

Change-Id: Id0dbccffb217315aeb85c964e379833e6aa3f5af
2011-04-07 18:26:15 -07:00
Freeman Ng
96be4e01e6 Add prepaid data services URL to Secure Settings
This is really a Gservices value being accessed through Secure Settings

bug: 4100048
Change-Id: I6e2eb72b17594b5c8f14a6ecfc21eafeff80fa1b
2011-04-07 18:21:40 -07:00
Teng-Hui Zhu
22954d435d Don't send pause again when coming back from full screen
When we enter full screen, the inline video has been paused.
When we re-play in the inline mode, we don't need to paused the previous video,
which is the full screen one.

bug:4259109
Change-Id: Ib951846e6c22893713b00699263f7d038bcb7353
2011-04-07 17:53:24 -07:00
Nicolas Roard
280dda75f3 am 16d8de7a: am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1
* commit '16d8de7a293e5d626823a59f2d8b74e0d4a75cbd':
  Remove uncalled function -- java counterpart of the fix for bug:4183801
2011-04-07 17:27:53 -07:00
Nicolas Roard
16d8de7a29 am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1
* commit '3e37a2f3ae3e3a777bf479a6562063922a7e44c6':
  Remove uncalled function -- java counterpart of the fix for bug:4183801
2011-04-07 17:25:56 -07:00
Nicolas Roard
3e37a2f3ae am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1
* commit 'fcba23536b1b432a5977e1ba4ea70ae0ff5aed4a':
  Remove uncalled function -- java counterpart of the fix for bug:4183801
2011-04-07 17:24:05 -07:00
Nicolas Roard
fcba23536b Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1 2011-04-07 17:21:53 -07:00
Adam Cohen
592cb584b0 Merge "Fix crash in bug 4259574" 2011-04-07 17:12:19 -07:00
Daisuke Miyakawa
52b952669d Merge "Add params for primary account to ContactsContract" 2011-04-07 17:03:18 -07:00
Adam Cohen
fa2e3ff3d3 Fix crash in bug 4259574
Change-Id: I7fb3a4485ecfc2ac19eebdcfdcfe26e97a08e6b5
2011-04-07 16:48:19 -07:00
Robert Greenwalt
af6eddb1c2 Fix build.
Change-Id: I9ac1c28de4f3f11f84b04923d4547ab64dd57f23
2011-04-07 15:44:10 -07:00
Nicolas Roard
4bae836784 Remove uncalled function -- java counterpart of
the fix for bug:4183801

Change-Id: Icaaa83743976be180ba570158bd4016e7f53c95a
2011-04-07 15:04:26 -07:00
Teng-Hui Zhu
4e790ee189 am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
* commit '29fa50be2484ed9d7a5e8075b764caa37b6494b9':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master
2011-04-07 14:24:22 -07:00
Teng-Hui Zhu
29fa50be24 am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
* commit 'bb55777be1a3231d187205dc378ca35b01e8bc65':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master
2011-04-07 14:22:33 -07:00
Robert Greenwalt
80f7c594fa am f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
* commit 'f4a29403ae5b6d3e8e754a025d33f0c33adecb21':
  Add external dependency API.
2011-04-07 14:22:03 -07:00
Robert Greenwalt
f4a29403ae resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
2011-04-07 14:13:52 -07:00
Eric Fischer
567882e1f9 Merge "Import revised translations." 2011-04-07 14:08:55 -07:00