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

63840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
0dfb86010c am f9bb1cd1: resolved conflicts for merge of fb729202 to master 
* commit 'f9bb1cd1fcff7079445dae494ce5d56276092c11':
  Invalidated bounds tightened in TextView
 2011-12-06 16:17:28 -08:00
Gilles Debunne
f9bb1cd1fc resolved conflicts for merge of fb729202 to master 
Change-Id: Ic571594b14f2822094d5c1aa4c4b1e9da4a2eae0
 2011-12-06 15:57:47 -08:00
Tor Norbye
1988c4edf8 am e98ae0a0: Merge "Upgrade layoutlib generation code to use ASM 4.0" 
* commit 'e98ae0a050d6ce4b3e2aec7c070a87922086c256':
  Upgrade layoutlib generation code to use ASM 4.0
 2011-12-06 13:33:50 -08:00
Tor Norbye
e98ae0a050 Merge "Upgrade layoutlib generation code to use ASM 4.0" 2011-12-06 13:31:04 -08:00
Gilles Debunne
fb72920209 am 98a85c2d: Merge "Invalidated bounds tightened in TextView" into ics-mr1 
* commit '98a85c2de6b3f27ba1ccb2cfd44a775b4f490f72':
  Invalidated bounds tightened in TextView
 2011-12-06 11:22:19 -08:00
Gilles Debunne
98a85c2de6 Merge "Invalidated bounds tightened in TextView" into ics-mr1 2011-12-06 11:20:18 -08:00
Jeff Sharkey
ae87906db3 am 7f2e21b6: Merge "Move native vold calls to varargs." 
* commit '7f2e21b6f4de96c8be986b5ec02200fac464f814':
  Move native vold calls to varargs.
 2011-12-06 10:40:45 -08:00
Eric Fischer
31b9a7b197 am dc92cd7d: am e9493f68: (-s ours) am 58ad16cf: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'dc92cd7dbfc1fdbbd707375ebc84e906b9783f18':
  Import revised translations.  DO NOT MERGE
 2011-12-06 10:40:43 -08:00
Jeff Sharkey
7f2e21b6f4 Merge "Move native vold calls to varargs." 2011-12-06 10:38:55 -08:00
Eric Fischer
dc92cd7dbf am e9493f68: (-s ours) am 58ad16cf: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'e9493f68381c2fb01b1e400aa5dbd25e77281c56':
  Import revised translations.  DO NOT MERGE
 2011-12-06 10:38:14 -08:00
Eric Fischer
e9493f6838 am 58ad16cf: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '58ad16cfeaac1c2124d0f9e9d2b5c493e163128c':
  Import revised translations.  DO NOT MERGE
 2011-12-06 10:36:30 -08:00
Svetoslav Ganov
2f034d184f am d5f44204: am 1113e755: am ea25ea7e: Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1 
* commit 'd5f44204578d6b3d9c3864eaed84bf453998c7cf':
  Adding a system preference whether to speak passwords in accessibility mode.
 2011-12-06 10:35:10 -08:00
Eric Fischer
58ad16cfea Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-06 10:34:41 -08:00
Svetoslav Ganov
d5f4420457 am 1113e755: am ea25ea7e: Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1 
* commit '1113e75588782cc23074b9a9bb887de06eff8a49':
  Adding a system preference whether to speak passwords in accessibility mode.
 2011-12-06 10:32:51 -08:00
Svetoslav Ganov
1113e75588 am ea25ea7e: Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1 
* commit 'ea25ea7ef30be14dd940f1667e0308bfff5b4d85':
  Adding a system preference whether to speak passwords in accessibility mode.
 2011-12-06 10:29:13 -08:00
Eric Fischer
c92b5c227a Import revised translations. DO NOT MERGE 
Change-Id: I1d49a1533bd0481543280a379a9f93bd7027e54a
 2011-12-06 10:27:06 -08:00
Svetoslav Ganov
ea25ea7ef3 Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1 2011-12-06 10:27:04 -08:00
The Android Open Source Project
d53eb89d4e am 08943f7a: Reconcile with ics-mr1-release 
* commit '08943f7acc118e6ae38823242d9c41a125c34ad6':
 2011-12-06 09:06:23 -08:00
The Android Open Source Project
08943f7acc Reconcile with ics-mr1-release 
Change-Id: I2790bcf28bdac1335b4106138fc6ad471ac40516
 2011-12-06 09:02:58 -08:00
Jeff Brown
e41764c0dd am f4074d02: am e589fc89: (-s ours) am 4079702a: Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1 
* commit 'f4074d025a3b28d40fe99e409c98dbbb1711c7d8':
  Fix memory corruption issues in TextLayoutCache.  (DO NOT MERGE)
 2011-12-06 08:52:22 -08:00
Jim Miller
def6f52ec2 am 63b24443: am a3e3c4dd: am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1 
* commit '63b244433f7b1941685ba6b93b0e4e968de65bcc':
  Fix 5705837: Dismiss keyguard when launching Settings from Statusbar
 2011-12-06 08:52:20 -08:00
Jeff Brown
f4074d025a am e589fc89: (-s ours) am 4079702a: Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1 
* commit 'e589fc8984d2be7a8b78d78a5290c8fed014dcbd':
  Fix memory corruption issues in TextLayoutCache.  (DO NOT MERGE)
 2011-12-06 08:49:53 -08:00
Jim Miller
63b244433f am a3e3c4dd: am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1 
* commit 'a3e3c4dd37139615adb88a38e6a99402e0cfcd2b':
  Fix 5705837: Dismiss keyguard when launching Settings from Statusbar
 2011-12-06 08:49:51 -08:00
George Mount
2b08a9cd60 am 419204c8: Merge "Remove inFullScreenMode JNI call during drawGL call." 
* commit '419204c8fb77ead7bac1523487bc40202f460215':
  Remove inFullScreenMode JNI call during drawGL call.
 2011-12-06 08:44:02 -08:00
George Mount
419204c8fb Merge "Remove inFullScreenMode JNI call during drawGL call." 2011-12-06 08:42:07 -08:00
Claudia de Veaux
ae027ab3e8 am eba76f35: Merge "Edits to strings to meet UI text standards. * Use contractions. * Use \u2026 instead of ... for ellipsis. * Use straight quotes (for now that\'s the standard). * Made the permission descriptions consistent. * Use sentence case everywhere except for 
* commit 'eba76f3561065f5a0d8a6044072704a9ec415424':
  Edits to strings to meet UI text standards. * Use contractions. * Use \u2026 instead of ... for ellipsis. * Use straight quotes (for now that's the standard). * Made the permission descriptions consistent. * Use sentence case everywhere except for proper nouns. * Notification messages need ending punctuation. * Use "touch" instead of "tap". * Use "choose" instead of "select", except when selecting text. * Use "sign into" instead of "sign in to". * Use "Do you want..." instead of "Would you like..." * Autofill has only initial cap.
 2011-12-06 08:29:02 -08:00
Claudia de Veaux
eba76f3561 Merge "Edits to strings to meet UI text standards. * Use contractions. * Use \u2026 instead of ... for ellipsis. * Use straight quotes (for now that's the standard). * Made the permission descriptions consistent. * Use sentence case everywhere except for proper nouns. * Notification messages need ending punctuation. * Use "touch" instead of "tap". * Use "choose" instead of "select", except when selecting text. * Use "sign into" instead of "sign in to". * Use "Do you want..." instead of "Would you like..." * Autofill has only initial cap." 2011-12-06 08:27:11 -08:00
Brian Colonna
104b13838f am 4f102ea7: Merge "Making Face Unlock fix that wasn\'t proerly merged in master" 
* commit '4f102ea7865737c2a17f261c7efa4c06aee9c87a':
  Making Face Unlock fix that wasn't proerly merged in master
 2011-12-06 07:28:17 -08:00
Brian Colonna
4f102ea786 Merge "Making Face Unlock fix that wasn't proerly merged in master" 2011-12-06 07:25:59 -08:00
Brian Colonna
6e6e5df754 Making Face Unlock fix that wasn't proerly merged in master 
It appears that https://android-git.corp.google.com/g/#/c/144795/1
was incorrectly merged down into master.  This commit is to correctly
add the change from that cl into the master branch.

Without this change, if you bring up the emergency dialer while Face
Unlock is running, you momentarily see the backup lock.

Change-Id: I6350150bf46ac52d5c50c9e88119f09397d22902
 2011-12-06 10:04:38 -05:00
Jeff Brown
e589fc8984 am 4079702a: Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1 
* commit '4079702ac27b51282a25de5f7c20f6fba6b71995':
  Fix memory corruption issues in TextLayoutCache.  (DO NOT MERGE)
 2011-12-05 22:52:20 -08:00
Jeff Brown
4079702ac2 Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1 2011-12-05 22:50:49 -08:00
Jim Miller
a3e3c4dd37 am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1 
* commit '17f9fe13c7c78eaab521f6f85b48b0e8f5adddbc':
  Fix 5705837: Dismiss keyguard when launching Settings from Statusbar
 2011-12-05 22:14:37 -08:00
Jim Miller
17f9fe13c7 Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1 2011-12-05 22:12:54 -08:00
Jesse Hall
b1d407bbbd am 4a3d5b04: am 2eb4a5ee: am 3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1 
* commit '4a3d5b04daa74dc3bd5084b3395892b5565e6288':
  Fix statusbar crash on devices with no Bluetooth
 2011-12-05 21:29:16 -08:00
Jesse Hall
4a3d5b04da am 2eb4a5ee: am 3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1 
* commit '2eb4a5ee5bebf4120de217adf5a9f72b0c94951b':
  Fix statusbar crash on devices with no Bluetooth
 2011-12-05 21:27:30 -08:00
Jesse Hall
2eb4a5ee5b am 3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1 
* commit '3e7b412d7d6332830ceaf123edb5e211757c69ce':
  Fix statusbar crash on devices with no Bluetooth
 2011-12-05 21:24:53 -08:00
Jesse Hall
3e7b412d7d Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1 2011-12-05 21:23:29 -08:00
Jeff Brown
d98a85a87d am 1c2bfd4a: Merge "Use a Choreographer to schedule animation and drawing." 
* commit '1c2bfd4af9da972895830888cd9ab3426af9062f':
  Use a Choreographer to schedule animation and drawing.
 2011-12-05 21:21:07 -08:00
Jeff Brown
915c034970 am 731b939d: Merge "Add a new class to receive vsync events." 
* commit '731b939de88a4fc5fcdc977845d095eee67d87c5':
  Add a new class to receive vsync events.
 2011-12-05 21:21:05 -08:00
Jeff Brown
55a13f8e7b am 935fa021: Merge "Refactor ValueAnimator to reduce use of ThreadLocals." 
* commit '935fa021722c616ecfe54a066257f099f3e2615c':
  Refactor ValueAnimator to reduce use of ThreadLocals.
 2011-12-05 21:21:03 -08:00
Jeff Brown
1c2bfd4af9 Merge "Use a Choreographer to schedule animation and drawing." 2011-12-05 21:19:46 -08:00
Jeff Brown
731b939de8 Merge "Add a new class to receive vsync events." 2011-12-05 21:19:41 -08:00
Jeff Brown
935fa02172 Merge "Refactor ValueAnimator to reduce use of ThreadLocals." 2011-12-05 21:19:38 -08:00
Mathias Agopian
d9790c836e am 82fbc9be: Merge "fix a deadlock when removing a DisplayEventConnection" 
* commit '82fbc9be7cc7a7d98ac0cd791e7d4fe9f7deaa92':
  fix a deadlock when removing a DisplayEventConnection
 2011-12-05 21:15:56 -08:00
Mathias Agopian
82fbc9be7c Merge "fix a deadlock when removing a DisplayEventConnection" 2011-12-05 21:14:03 -08:00
Jeff Brown
16ca807c20 am f697e5d6: Merge "Harfbuzz assumes the length of the item is at least 1." 
* commit 'f697e5d6b54e84f67b41ad8bbd933af05244c5a3':
  Harfbuzz assumes the length of the item is at least 1.
 2011-12-05 20:45:24 -08:00
Jeff Brown
bb727c9e10 am 65c1cc5f: Merge "Ensure log_clusters array is big enough." 
* commit '65c1cc5fbd0e392f8ad0cbb3591e11959c232f4c':
  Ensure log_clusters array is big enough.
 2011-12-05 20:45:22 -08:00
Jeff Brown
f697e5d6b5 Merge "Harfbuzz assumes the length of the item is at least 1." 2011-12-05 20:43:55 -08:00
Jeff Brown
65c1cc5fbd Merge "Ensure log_clusters array is big enough." 2011-12-05 20:43:36 -08:00