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

63217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
328310c6fa System bar now renders the back button for recents 
We used to render the back button in Recents
itself, but that had an inconsistent visual
experience.

As a part of this change, add the early beginning
of support for private status bar APIs for dimming
navigation buttons.

Bug: 3448536
 2011-12-06 17:22:19 -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
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
08943f7acc Reconcile with ics-mr1-release 
Change-Id: I2790bcf28bdac1335b4106138fc6ad471ac40516
 2011-12-06 09:02:58 -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
419204c8fb Merge "Remove inFullScreenMode JNI call during drawGL call." 2011-12-06 08:42:07 -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
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
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
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
82fbc9be7c Merge "fix a deadlock when removing a DisplayEventConnection" 2011-12-05 21:14:03 -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
Jeff Brown
f98c2a67fe Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE) 
Ensure log_clusters array is big enough.
Bug: 5714171

Explicitly handle the cases where the entire string or a single
run might have a length of 0.
Harfbuzz assumes the length of the item is at least 1.
If the length is zero, then it will clobber memory at index -1
into the log_clusters array.
Bug: 5705479

Change-Id: If28a9866221081f69973c1d12d7fe0cf8db2edd0
 2011-12-05 20:40:03 -08:00
The Android Automerger
fe0cff021d merge in ics-mr1-release history after reset to ics-mr1 2011-12-05 20:36:01 -08:00
Jeff Brown
a03bdedbdf Harfbuzz assumes the length of the item is at least 1. 
If the length is zero, then it will clobber memory at index -1
into the log_clusters array.

Explicitly handle the cases where the entire string or a single
run might have a length of 0.

Bug: 5705479
Change-Id: Ibbd3a4edcb7e1cad09c34091b42bb315776ea558
 2011-12-05 20:33:50 -08:00
Jeff Brown
738ef87eac Ensure log_clusters array is big enough. 
Bug: 5714171
Change-Id: I886f1af8af177827f052e6406a192f2fad5c2cec
 2011-12-05 20:24:21 -08:00
Matthew Xie
2016055a97 am 12479141: am 0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1 
* commit '12479141dd3e63a5f26a4509d0922c9ef9e3d78c':
  Broadcast turning on/off intent as early as possible when switch on/off BT
 2011-12-05 20:00:46 -08:00
Mathias Agopian
2871ce953c fix a deadlock when removing a DisplayEventConnection 
the deadlock would happen when the pipe became invalid and SF
trying to remove the connection from its list.

we know make sure to process events without holding a lock.

Change-Id: I39927ed8824fc7811e16db3c7608a2ebc72d9642
 2011-12-05 19:58:47 -08:00
Matthew Xie
12479141dd am 0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1 
* commit '0d9a41e74c81e8297ee439473c301a50da20cf0b':
  Broadcast turning on/off intent as early as possible when switch on/off BT
 2011-12-05 19:58:12 -08:00
Matthew Xie
0d9a41e74c Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1 2011-12-05 19:56:54 -08:00
Dianne Hackborn
deb86c63c3 am ec42750e: am 0c0120ef: Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1 
* commit 'ec42750e4d0e695515d078fb1f222c99a705fd93':
  Fix issue #5714517: App shortcuts can result in bad task intents
 2011-12-05 19:20:45 -08:00
Dianne Hackborn
ec42750e4d am 0c0120ef: Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1 
* commit '0c0120efa2dedaf25ae789bced5a3f9fa33c32bb':
  Fix issue #5714517: App shortcuts can result in bad task intents
 2011-12-05 19:18:34 -08:00
Dianne Hackborn
0c0120efa2 Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1 2011-12-05 19:16:54 -08:00
Dianne Hackborn
fc2e4f6d01 am 24ec8703: am 52245ac7: Merge "Fix issue #5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1 
* commit '24ec870322c801b0662d8b8d53232e89a94bc00a':
  Fix issue #5713576: Home redraws after returning from app on Nexus S 4G
 2011-12-05 19:11:23 -08:00
Dianne Hackborn
24ec870322 am 52245ac7: Merge "Fix issue #5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1 
* commit '52245ac7c41735c561199d9ec7e9577d592ca852':
  Fix issue #5713576: Home redraws after returning from app on Nexus S 4G
 2011-12-05 19:09:17 -08:00
Dianne Hackborn
52245ac7c4 Merge "Fix issue #5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1 2011-12-05 19:07:52 -08:00
Daniel Sandler
e5d361a89f am 83f79c90: am f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1 
* commit '83f79c90989bab2758d5c7d232eb537fb2242e8b':
  Fix sticky menu icon on tablet status bar.
 2011-12-05 19:06:17 -08:00
Daniel Sandler
83f79c9098 am f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1 
* commit 'f66664a50e914e1cc5d66046cfc4c5b195a09eab':
  Fix sticky menu icon on tablet status bar.
 2011-12-05 19:04:13 -08:00
Daniel Sandler
f66664a50e Merge "Fix sticky menu icon on tablet status bar." into ics-mr1 2011-12-05 19:02:28 -08:00
Dianne Hackborn
77eaaf04c6 Fix issue #5713576: Home redraws after returning from app on Nexus S 4G 
Turn of destroying of activities during memory trimming.

Change-Id: Ibea415c13fca4f67f56adefe81a1495f5f9ad273
 2011-12-05 19:00:42 -08:00
Adam Powell
16bf40b8c7 am 7cd1851d: am 9a856f4e: Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1 
* commit '7cd1851d82bc44acd1bd6d36f2a5f1ebccaefabf':
  Drop API level for notification compatibility BG to 8 (from 10)
 2011-12-05 17:49:04 -08:00
Dianne Hackborn
f5b8671c34 Fix issue #5714517: App shortcuts can result in bad task intents 
New API to let you build an Intent whose base configuration is correct,
but has an additional "selector" to pick out the specific app that you
would like launched.

Change-Id: Ide9db6dc60e2844b7696cfe09b28337fe7dd63db
 2011-12-05 17:42:41 -08:00
Adam Powell
7cd1851d82 am 9a856f4e: Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1 
* commit '9a856f4ee7b49f735e31b57a09bee2f033ce20a5':
  Drop API level for notification compatibility BG to 8 (from 10)
 2011-12-05 17:40:18 -08:00