Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,768 Commits 3 Branches 0 Tags
22cfd047abb09929331ce2727499a24bcbb3604b
Commit Graph

64768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
22cfd047ab Merge "Fix bug #5846413 "phone" keyboard layout is broken on master" 2012-01-23 15:46:58 -08:00
Romain Guy
d215ddf3d9 Merge "Fix API typo" 2012-01-23 15:35:24 -08:00
Romain Guy
1e878d2ff5 Fix API typo 
Change-Id: Iac6de947b0d550cc8dd4a3b5d88baa322c21bbb8
 2012-01-23 15:34:25 -08:00
Justin Ho
5d76def68d am feb1d988: (-s ours) am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1 
* commit 'feb1d988c8ea1a67a4edbf1914ea41ea73519e12':
  DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
 2012-01-23 15:16:00 -08:00
Justin Ho
feb1d988c8 am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1 
* commit 'fee5a860a8355cda071ff23644e943414ba7f65d':
  DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
 2012-01-23 15:13:19 -08:00
Justin Ho
fee5a860a8 Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1 2012-01-23 15:11:00 -08:00
John Reck
bc932579ea Merge "Fix crash when scrolling a layer" 2012-01-23 15:04:13 -08:00
Justin Ho
b918035d34 DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)" 
This reverts commit 71c4496a97.

Change-Id: Iff10c49ea728bb10023ddeb50a3b708db770fff2
 2012-01-23 15:02:41 -08:00
John Reck
7aa7ba1ce6 Fix crash when scrolling a layer 
Change-Id: I6e61f3b38c5d1291ceb36c9dfa87fcd78480c2f4
 2012-01-23 14:53:47 -08:00
Dianne Hackborn
fc5851579a Merge "New screen rotation animation design." 2012-01-23 14:34:55 -08:00
Gilles Debunne
3909242141 Merge "Double tap to select enabled on suggestions" 2012-01-23 14:10:44 -08:00
Fabrice Di Meglio
bd901dee31 Fix bug #5846413 "phone" keyboard layout is broken on master 
- was a subtle regression introduced when fixing bug #5753006
- as we are now using SkPaint::kGlyphID_TextEncoding (glyph encoding)
instead of SkPaint::kUTF16_TextEncoding (UTF16 encoding), we need to
force the UTF16 encoding in some cases that are NOT going thru
the TextLayoutCache / Harfbuzz shaping

- fix also breakText() the same way

- also clean some old comment

- Warning: depends also on a CL from Skia for having getBaseGlyphCount() "const"

Change-Id: I3d1fc87f070884876c679b33541f810fbfb5df3f
 2012-01-23 13:34:08 -08:00
Dianne Hackborn
fd1c5ed370 New screen rotation animation design. 
We now have an animation that can start as soon as we detect to
rotate the screen, and have a different phase once the new UI
is ready to complete the transition into it.

Change-Id: I05b9c12a699232acbddc36b4a994a4452db71476
 2012-01-23 12:52:43 -08:00
Dianne Hackborn
a6b8fe1c71 Merge "New brightness setting to adjust auto-brightness mode." 2012-01-23 12:36:19 -08:00
Wink Saville
5d6a095e65 Merge "Do not clear good TLVs when a error occurs decoding." 2012-01-23 12:22:21 -08:00
Andy McFadden
d71b9154da Merge "Don't use bootstrap loader directly" 2012-01-23 12:21:19 -08:00
Wink Saville
7c27ac64d5 Do not clear good TLVs when a error occurs decoding. 
In change Ief74d0e4f4f28dff7a435e9dab1fab1ca1d9bfaf with a sha1 of
e81932e92a it seemed like a good idea
to throw away all TLV's on errors. In retrospect that was probably
not a good idea. For example on the MTN Ghana SIM the error
occurs because of some 0 pad bytes at the end, all of the actual
TLV's are good, so throwing away everything is unreasonable. Instead
accepting what is valid seems a better approach.

Also, add a couple debug lines on error paths.

Change-Id: I4add0c9cd242f46e0ef8700229d0ec755b9e4c4c
 2012-01-23 12:19:20 -08:00
Dianne Hackborn
d9ea468d6a New brightness setting to adjust auto-brightness mode. 
Change-Id: Icfec22be99d8c79e9ff5720b80fb9dacbba36134
 2012-01-23 12:01:00 -08:00
Bill Gruber
cf5c78f209 am add87f99: am 5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1 
* commit 'add87f99d9ece26c776abe40297e9a49e08932d9':
  DevDocs update: Publishing on Market
 2012-01-23 10:41:43 -08:00
The Android Open Source Project
8a6b2832a9 am 961b1df3: Reconcile with ics-mr1-release 
* commit '961b1df3fcbf5c441555b69ac52a5aed7f91a94e':
  Fix 5797764: Increase lock screen's thread priority
 2012-01-23 10:41:37 -08:00
Bill Gruber
add87f99d9 am 5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1 
* commit '5e5b57aef29b33d03965b4dc370cde9a39220adc':
  DevDocs update: Publishing on Market
 2012-01-23 10:23:10 -08:00
Bill Gruber
5e5b57aef2 Merge "DevDocs update: Publishing on Market" into ics-mr1 2012-01-23 10:21:16 -08:00
The Android Open Source Project
961b1df3fc Reconcile with ics-mr1-release 
Change-Id: If1b58550b6ddf90a654f08e4add9012a15a7134a
 2012-01-23 10:15:41 -08:00
Andy McFadden
dc7bf5d8bf Don't use bootstrap loader directly 
The VM is allowed to use null to represent the bootstrap class
loader, so attempting to call methods on it is a bad idea.  Use
the system class loader instead.

Change-Id: I9190848945f679d546d5fb30aba10fd27c7e5404
 2012-01-23 09:51:42 -08:00
Andy McFadden
30f1312b3c Merge "Use Map.Entry, not HashMap.Entry" 2012-01-23 09:34:17 -08:00
Jim Miller
8ffd2cccf0 am b1c7785c: am eaa11a72: Merge "Fix 5797764: Increase lock screen\'s thread priority" into ics-mr1 
* commit 'b1c7785c1110e171d3dd3deb259b1caeed0b9da6':
  Fix 5797764: Increase lock screen's thread priority
 2012-01-23 09:18:36 -08:00
Justin Ho
5691f6a882 am e46f8696: am b09f6f96: Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1 
* commit 'e46f869629ef27afb149c771e69dbbefe1135f33':
  Update WiMAX assets to match new style Bug: 5724605
 2012-01-23 09:18:30 -08:00
Daniel Sandler
e08c3e1520 am aaa7b772: am 639ed754: Hide mobile RSSI on devices without mobile data. 
* commit 'aaa7b7728f3ced062273b54e1fc3b9d7d815bdcd':
  Hide mobile RSSI on devices without mobile data.
 2012-01-23 09:18:24 -08:00
Justin Ho
9b4b378777 am ffb0c0b3: am 70e21c92: Merge "New out-of-service RSSI." into ics-mr1 
* commit 'ffb0c0b3ca2f8693a354aad17e21f1419d9f0379':
  New out-of-service RSSI.
 2012-01-23 09:18:20 -08:00
George Mount
699ed80038 Merge "Add cut and paste to ContentEditable." 2012-01-23 07:30:26 -08:00
Michael Jurka
5a89672f3e Merge "Remove fastInvalidate and setFast* methods" 2012-01-23 07:24:32 -08:00
Michael Jurka
5274d6f115 Merge "Improve rapid-fire presses on system bar" 2012-01-23 07:23:56 -08:00
Dianne Hackborn
02d37b9731 resolved conflicts for merge of 892d11f4 to master 
Change-Id: I21eca0002100d898e167a25aaa46d896deca2a11
 2012-01-20 18:42:07 -08:00
Christopher Tate
65f87ec733 Merge "Fix shared-storage full backup" 2012-01-20 17:59:06 -08:00
Christopher Tate
73d7369e0f Fix shared-storage full backup 
The special shared-storage step was mistakenly writing its data directly
to the USB output pipe rather than to the proper stacked data handling
chain that applies compression and encryption.  Fix this by getting rid
of the custom handling of the shared-storage data, instead folding it
into the normal data handling flow [with a small amount of additional
management because e.g. it doesn't need a "manifest" pseudofile in the
archive stream].

Fixes bug 5897791

Change-Id: I3995b07963334d2f8cce49b247c87d3d3ff93bed
 2012-01-20 17:41:41 -08:00
Glenn Kasten
0f73d75da0 Merge "Remove AudioFlinger dependencies on client" 2012-01-20 17:16:36 -08:00
Glenn Kasten
34f9f8bb83 Remove AudioFlinger dependencies on client 
Change-Id: Ibb591e41a3ca5d7015e2b66b98b8fef5f415fb37
 2012-01-20 17:12:59 -08:00
Guang Zhu
7a640a0936 Merge "Revert "Use port 18000 instead of 8000 for layout tests"" 2012-01-20 17:06:42 -08:00
Guang Zhu
d467347d73 Revert "Use port 18000 instead of 8000 for layout tests" 
port 8000 is no longer being occupied, plus this approach never worked 100% because some pages have access to port 8000 hard coded in HTML


This reverts commit e2b9d7f2f0
 2012-01-20 17:06:11 -08:00
Daniel Sandler
e0e10b41c4 am a64f899f: am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1 
* commit 'a64f899fa6159a8839a769d3f107f6c502da58c8':
  Always show appropriate mobile service label.
 2012-01-20 16:38:24 -08:00
Jeff Brown
2af9ecfd1e am 1bc82792: (-s ours) am ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1 
* commit '1bc82792b87c0aee65c53f84a6d7c6b5031a09bc':
  Implement a max time bound for rotation.  (DO NOT MERGE)
 2012-01-20 16:38:10 -08:00
Jeff Brown
8552b4a4b7 am 06a0fb95: (-s ours) am 5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1 
* commit '06a0fb953ff1c544bdbef2618d20ec1ba551eb6e':
  Fix a few memory leaks in the input dispatcher.  (DO NOT MERGE)
 2012-01-20 16:38:07 -08:00
The Android Open Source Project
32f17ee4b7 am 288cde7f: Reconcile with ics-mr1-release 
* commit '288cde7f0a17f47f7071168f442d19f703947cc9':
 2012-01-20 16:38:02 -08:00
Jean-Baptiste Queru
ba4ea763b5 am ee567e08: am c3c36b4f: am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" 
* commit 'ee567e08d973c0fad214889e8d980f9bfb535b34':
  Rename LOG_ASSERT to ALOG_ASSERT
 2012-01-20 16:37:52 -08:00
Jean-Baptiste Queru
1e5b88fb4f am 45470559: (-s ours) am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 
* commit '45470559cd4a499fd5d38cf708f0b531dc081fed':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
 2012-01-20 16:37:49 -08:00
Jean-Baptiste Queru
152e17367e am db2b3930: (-s ours) am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 
* commit 'db2b39300a8f763cf2d0c9808deb86db87d5492c':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
 2012-01-20 16:35:20 -08:00
Jean-Baptiste Queru
d4e936bf93 am dde686e2: (-s ours) am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 
* commit 'dde686e2bdf7ea679dae4fd4edbf94c71802dc28':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
 2012-01-20 16:32:45 -08:00
Jim Miller
f65b53132b Fix 5797764: Increase lock screen's thread priority 
This increases lock screen's thread priority from THREAD_PRIORITY_FOREGROUND
to THREAD_PRIORITY_DISPLAY to ensure it runs before other activities that
might stall lock screen when the screen turns on.

Change-Id: I14cf9f3f5c092817bc6cf2d0a254001a5d34f744
 2012-01-20 16:31:05 -08:00
Jean-Baptiste Queru
20a34b52ca am a1e87397: (-s ours) am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 
* commit 'a1e873975704814416ee4d5023bf0740ec195ec0':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
 2012-01-20 16:30:21 -08:00
Jean-Baptiste Queru
62a89549b7 am d6b5584b: (-s ours) am 97aa8ee8: Merge ee4618bc 
* commit 'd6b5584b67f8a2f3d8ea20d748652673d5761e33':
  Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
 2012-01-20 16:28:04 -08:00