drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
68,739 Commits 1 Branch 0 Tags
Commit Graph

68739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
c221d6ec2f am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit '27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
  Fix issue #6073913: onActivityResult() not getting called...
 2012-02-28 15:03:18 -08:00
Dianne Hackborn
27e20ccd9a Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 2012-02-28 15:01:05 -08:00
felipeal
d9f94416fc am 635d492d: (-s ours) am 4bcc9108: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit '635d492d5918fe11a3a9bb9d9a87839a8331d34b':
 2012-02-28 14:59:29 -08:00
felipeal
dcd55a015c am 96236bc8: (-s ours) am fa73815e: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit '96236bc8d93efc0573a18b87699d56a3ed8c0b0b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
 2012-02-28 14:59:26 -08:00
Jean-Baptiste Queru
973481d667 am ccd08b8d: am e939edb5: am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 
* commit 'ccd08b8de9dc4c9cfaee93cbbcc7053cc9e8d96f':
  Fixes update of extras Bundle in new Locations for GPS Provider
 2012-02-28 14:59:18 -08:00
Dianne Hackborn
5c607433e3 Fix issue #6073913: onActivityResult() not getting called... 
...if the process is killed and restarted

Try to ensure that in all cases we deliver an activity result if one
was requested.

Change-Id: Id43e830d2ee782f98ed1e3b68e5e16f3258d4ad8
 2012-02-28 14:45:23 -08:00
Michael Jurka
a267f0a707 Merge "Add shortcut for voice search" 2012-02-28 14:40:33 -08:00
Michael Jurka
7a3489552c Add shortcut for voice search 
On phones with soft nav bar, make long press on
home launch a voice search intent

Change-Id: I69840a96a08524a76e33a306b799222c879db095
 2012-02-28 14:37:35 -08:00
Fabrice Di Meglio
ff40ab7a41 Fix bug #5180841 TextLayoutCache needs to support Indic 
- add Tamil and Devanagari shaping support

Change-Id: I331ec52cd1987e157100deb699db27f855881c32
 2012-02-28 14:35:48 -08:00
James Dong
2f16d7eae1 Merge "Fix API issues in DrmRights class." 2012-02-28 14:34:02 -08:00
James Dong
e512ad5089 Merge "Deprecate default constructor for classes that should have been meant to be interfaces" 2012-02-28 14:33:19 -08:00
felipeal
635d492d59 am 4bcc9108: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit '4bcc910817c694c8d8b20e39a5ff42c584af1d49':
 2012-02-28 14:09:43 -08:00
felipeal
96236bc8d9 am fa73815e: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit 'fa73815e1d953e67c635877440e717dc84465d97':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
 2012-02-28 14:07:26 -08:00
felipeal
4bcc910817 am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit 'e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
 2012-02-28 14:05:23 -08:00
felipeal
fa73815e1d am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit 'e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
 2012-02-28 14:04:20 -08:00
Eric Fischer
6fa13b5a02 Merge "Import translations. DO NOT MERGE" 2012-02-28 13:56:29 -08:00
Eric Fischer
cb4c17d27a Merge "Import translations. DO NOT MERGE" 2012-02-28 13:55:24 -08:00
Jean-Baptiste Queru
ccd08b8de9 am e939edb5: am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 
* commit 'e939edb5b4e991998ae8219b03d75c10cdc765cb':
  Fixes update of extras Bundle in new Locations for GPS Provider
 2012-02-28 13:53:17 -08:00
felipeal
e4ef9b1ac2 DO NOT MERGE 
(from master: Fixed minor typo on Javadoc)

Change-Id: I7d62e37011a7fd4d792fdfe5bd62022a850303a6
 2012-02-28 13:47:15 -08:00
Jean-Baptiste Queru
e939edb5b4 am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 
* commit 'f418738c64413b818e2dc507c912c2678876632f':
  Fixes update of extras Bundle in new Locations for GPS Provider
 2012-02-28 13:33:44 -08:00
Jean-Baptiste Queru
f418738c64 am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 
* commit 'd7fa7deef9bc0cf22bf450fdb062327697c087c4':
  Fixes update of extras Bundle in new Locations for GPS Provider
 2012-02-28 13:30:39 -08:00
Jeff Sharkey
c81ec3637b Merge "Suppress StrictMode in handleBindApplication()." 2012-02-28 13:21:04 -08:00
James Dong
31db8b9f6b Merge "Remove unnecessary header file includes for drmserver" 2012-02-28 13:09:44 -08:00
James Dong
da5ac93b00 Merge "Added missing javadoc comment for public API in DrmUtils class" 2012-02-28 13:09:24 -08:00
Bart Sears
07912f876c Update AndroidEmoji to version 1.01 
The following four glphys were in version 1.0, but were at the
wrong Unicode points (F1238-A & F1250).  This version moves
these glyphs to the correct Unicode locations (1F238-A & 1F250).

SQUARED CJK UNIFIED IDEOGRAPH-7533: U+F1238 --> U+1F238
SQUARED CJK UNIFIED IDEOGRAPH-5272: U+F1239 --> U+1F239
SQUARED CJK UNIFIED IDEOGRAPH-55B6: U+F123A --> U+1F23A
CIRCLED IDEOGRAPH ADVANTAGE:        U+F1250 --> U+1F250

Change-Id: I20c40ec4c7fbe960bb264985686c0a17ad8d4a5e
 2012-02-28 13:05:36 -08:00
Ying Wang
04a3a4350e Disable ProGuard for FakeOemFeatures to fix build. 
Change-Id: If0ccf16712bf43adb5fe490906be2a13b484f726
 2012-02-28 12:53:19 -08:00
Eric Fischer
18634b34e6 Import translations. DO NOT MERGE 
Change-Id: I2761d2e7bb8795ab23a0024ed41ec299abc400e1
 2012-02-28 12:23:51 -08:00
Eric Fischer
604a7d4e26 Import translations. DO NOT MERGE 
Change-Id: If4aaaf59012a1e6b799e3020a98f6f71117d5895
 2012-02-28 12:13:13 -08:00
Jeff Sharkey
7c5016787e Suppress StrictMode in handleBindApplication(). 
Allow disk access during application and provider setup.  This could
block processing ordered broadcasts, but later processing would
probably end up doing the same disk access.

Bug: 6083825
Change-Id: I80f383063cedba2b099c78465134faa811e898d8
 2012-02-28 12:11:29 -08:00
Jason Noguchi
2437a4ab02 am bb189574: am eac4b187: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'bb189574614d1ce8f9d61e58b7aebbd18f0d6c25':
 2012-02-28 11:57:39 -08:00
Jason Noguchi
eb5698a6b9 am a1de5e48: am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'a1de5e48125797b5a6fcc43b68ddfd3d9d831e87':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:55:13 -08:00
Jason Noguchi
bb18957461 am eac4b187: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'eac4b187d357eac61475c4dc6f673656e08e75a9':
 2012-02-28 11:53:49 -08:00
Jason Noguchi
a1de5e4812 am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit '743aceec4289508a8c514dae7319659cf7f278c4':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:52:56 -08:00
Jason Noguchi
743aceec42 am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:50:14 -08:00
Jason Noguchi
eac4b187d3 am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:49:30 -08:00
Jason Noguchi
ee32993095 Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 2012-02-28 11:47:46 -08:00
John Reck
42fb45588f Merge "Fix cursorRingBounds NPE" 2012-02-28 11:40:00 -08:00
John Reck
c2baeffe00 Merge "Fix NPE" 2012-02-28 11:38:56 -08:00
John Reck
5528d7ccd1 Fix cursorRingBounds NPE 
Bug: 6083657

Change-Id: I0aa30bc1df266b2f74b0fedfb635b71d63638fdb
 2012-02-28 11:29:29 -08:00
Dianne Hackborn
ef437848ca Merge "You could think of this as what an OEM might do." 2012-02-28 11:26:02 -08:00
James Dong
8fe9260bbb Merge "Deprecated a mis-spelled method and replaced it with a new method" 2012-02-28 11:23:26 -08:00
John Reck
79d99bebc1 Fix NPE 
Bug: 6083360

Change-Id: I8d4a4cfb4ca0bbefd848a6ed7a628bc3838e4f91
 2012-02-28 11:21:17 -08:00
Gilles Debunne
9f102ca592 Vibrate on long press, even out of text 
Bug 6073057

Change-Id: I53441f365419aa1ae4d51e03efff46697059d38a
 2012-02-28 11:15:56 -08:00
Android Git Automerger
af2abf5ada am a66926ff: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit 'a66926ff7fac7ef77da1b5f3f1a1dd9dd8d6b960':
 2012-02-28 10:51:35 -08:00
Svetoslav Ganov
0631ac93f6 am 8f4582a2: am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit '8f4582a278d3f93450f2a72ad6f6dc872668efb9':
 2012-02-28 10:51:32 -08:00
Android Git Automerger
a66926ff7f Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-02-28 10:49:07 -08:00
Svetoslav Ganov
69db4df487 am 0c96daa5: am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit '0c96daa5d5a1ef778ad1ef4619ef1fa4c30519c6':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:41:42 -08:00
Svetoslav Ganov
8f4582a278 am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit 'c78f121716ff7d4cbf8a70519a266ae030942751':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:39:17 -08:00
Svetoslav Ganov
0c96daa5d5 am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit '0c7ffac4caf413bd5fef2002079ec1d4bff2bc37':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:38:39 -08:00
Svetoslav Ganov
0c7ffac4ca am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:35:43 -08:00