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

63249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
9c316f3c6a am d49ec62c: am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1 
* commit 'd49ec62cfb0469c39f2b5d79cbf2a6f69cceb7d7':
  New and improved silent mode on lockscreen.
 2011-12-06 16:59:44 -08:00
Adam Powell
e49e8cc4e7 Merge "resolved conflicts for merge of 6a828712 to master" 2011-12-06 16:57:35 -08:00
Adam Powell
e4b8ff8068 resolved conflicts for merge of 6a828712 to master 
Change-Id: I73c804667a890bcc9924951ff655137c1345541a
 2011-12-06 16:53:47 -08:00
Jeff Brown
07ee3418bb Merge "Add tap and swipe capabilities to the "input" tool." 2011-12-06 16:47:29 -08:00
Romain Guy
bdfe770e08 Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" 2011-12-06 16:37:58 -08:00
Romain Guy
9c4b79af22 Discard framebuffer rendering queues when discarding layers 
Bug #5581817

Change-Id: Ie30700a29059d2ea60eb7bd3f8bd20ac48a149ab
 2011-12-06 16:37:10 -08:00
Jeff Brown
b42d5e2b9b Merge "Fix PIN pad." 2011-12-06 16:18:03 -08:00
Jeff Brown
07069a04ef Fix PIN pad. 
Some widgets apparently inject keys into the ViewRoot by sending
a DISPATCH_KEY message to its handler.  Ugh.

Bug: 5711577
Change-Id: Ibe9aaf705095d152ec866c536f31f5d85e27b97f
 2011-12-06 16:15:22 -08:00
Jeff Brown
797e4465fb Add tap and swipe capabilities to the "input" tool. 
Change-Id: Ia2950d281ef04232c5134fa045ce18272fbd6f81
 2011-12-06 16:06:13 -08:00
James Dong
ed1d1838f0 am 49782b81: (-s ours) am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1 
* commit '49782b8100a752056f044f6f3f1cf16a6a1f03b4':
  DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
 2011-12-06 16:04:38 -08:00
Andreas Huber
a0befca940 am c4738293: (-s ours) am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1 
* commit 'c4738293527618f9a228c3f0f645c0a0704ada9c':
  DO NOT MERGE: Remove the AVI extractor.
 2011-12-06 16:04:36 -08:00
Irfan Sheriff
591f6fa7c7 am 5e2e7d5f: am 40cb30c2: am 7b62313e: Disable wifiwatchdog for now 
* commit '5e2e7d5fb81266640f8284abb25fe8be06693f5b':
  Disable wifiwatchdog for now
 2011-12-06 16:04:30 -08:00
Gilles Debunne
f9bb1cd1fc resolved conflicts for merge of fb729202 to master 
Change-Id: Ic571594b14f2822094d5c1aa4c4b1e9da4a2eae0
 2011-12-06 15:57:47 -08:00
Amith Yamasani
d49ec62cfb am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1 
* commit 'f336408000c4be36045401fb4df89528249e7383':
  New and improved silent mode on lockscreen.
 2011-12-06 15:37:31 -08:00
Amith Yamasani
f336408000 Merge "New and improved silent mode on lockscreen." into ics-mr1 2011-12-06 15:36:10 -08:00
Amith Yamasani
6243edd818 New and improved silent mode on lockscreen. 
3-state item to toggle between Silent/Vibrate/Ringer in long-press power menu.
No volume dialog on lockscreen, unless Power menu is up.

Set VIBRATE_IN_SILENT=1 when upgrading device.

Change-Id: I097d216f96c4abdbd83420e0c477106951b3607d
 2011-12-06 14:48:38 -08:00
Adam Powell
6a828712ad am 720efc43: Merge "Lower touch slop in ViewConfiguration." into ics-mr1 
* commit '720efc43d89ce9fd50b66f22cdb1bb4363cfb291':
  Lower touch slop in ViewConfiguration.
 2011-12-06 14:00:18 -08:00
Adam Powell
720efc43d8 Merge "Lower touch slop in ViewConfiguration." into ics-mr1 2011-12-06 13:58:20 -08:00
Tor Norbye
e98ae0a050 Merge "Upgrade layoutlib generation code to use ASM 4.0" 2011-12-06 13:31:04 -08:00
James Dong
49782b8100 am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1 
* commit '6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3':
  DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
 2011-12-06 12:55:39 -08:00
James Dong
6b8b5a0a41 Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1 2011-12-06 12:52:52 -08:00
Andreas Huber
c473829352 am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1 
* commit '05d630691127c022befd071b2bede87c707112a9':
  DO NOT MERGE: Remove the AVI extractor.
 2011-12-06 12:46:46 -08:00
Andreas Huber
05d6306911 Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1 2011-12-06 12:44:53 -08:00
Adam Powell
7d39f85acf Lower touch slop in ViewConfiguration. 
Our typical touchscreens are now good enough that we don't need the
touch slop to be as large as it once was. Lower it to increase
responsiveness while scrolling.

Move the touch slop constant to the config resource
config_viewConfigurationTouchSlop so that it may be more easily
tweaked in device-specific overlays.

Change-Id: I7c11d8affcb98e91654203beb13a26cfeec18f7c
 2011-12-06 12:08:47 -08:00
Irfan Sheriff
5e2e7d5fb8 am 40cb30c2: am 7b62313e: Disable wifiwatchdog for now 
* commit '40cb30c2df2176c03f24cbdc194e3af5a4f64758':
  Disable wifiwatchdog for now
 2011-12-06 11:37:40 -08:00
Irfan Sheriff
40cb30c2df am 7b62313e: Disable wifiwatchdog for now 
* commit '7b62313eab4af8835a64fb3fe1e15e5e534a9479':
  Disable wifiwatchdog for now
 2011-12-06 11:34:58 -08:00
Andreas Huber
92f604c4d4 DO NOT MERGE: Remove the AVI extractor. 
Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
 2011-12-06 11:24:34 -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
Irfan Sheriff
7b62313eab Disable wifiwatchdog for now 
Change-Id: I2ac4fa706f3d0a415cb8e86002173b776aba4e02
 2011-12-06 11:21:22 -08:00
Gilles Debunne
98a85c2de6 Merge "Invalidated bounds tightened in TextView" into ics-mr1 2011-12-06 11:20:18 -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