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

84051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guang Zhu
77fce32f60 am c693b86f: am 7b3ca5bb: Merge "Revert "fix sdcard path for webkit perf and layout test scripts"" into jb-mr1-dev 
* commit 'c693b86ff4724cefb43117ab46569011dd428f3a':
  Revert "fix sdcard path for webkit perf and layout test scripts"
 2012-08-20 21:17:46 -07:00
Guang Zhu
c693b86ff4 am 7b3ca5bb: Merge "Revert "fix sdcard path for webkit perf and layout test scripts"" into jb-mr1-dev 
* commit '7b3ca5bb418a6300a9caf6e5e5ee31d73f7121b4':
  Revert "fix sdcard path for webkit perf and layout test scripts"
 2012-08-20 21:14:52 -07:00
Guang Zhu
7b3ca5bb41 Merge "Revert "fix sdcard path for webkit perf and layout test scripts"" into jb-mr1-dev 2012-08-20 21:10:39 -07:00
Guang Zhu
738d39c5a0 Revert "fix sdcard path for webkit perf and layout test scripts" 
This reverts commit 8aaa32b13e565893c57059ca14eb49fbe4bdf0ba

Change-Id: I831eb07943c85bb23b43bdf2d9026bf88ed23c5a
 2012-08-20 21:09:28 -07:00
Jeff Brown
94fe3b57b2 am 2f2a9fc5: am 8eaba600: Merge "Disable electron beam on animation." into jb-mr1-dev 
* commit '2f2a9fc50acb0e2be6450d1a5031e2019f6893fb':
  Disable electron beam on animation.
 2012-08-20 20:33:51 -07:00
Jeff Brown
2f2a9fc50a am 8eaba600: Merge "Disable electron beam on animation." into jb-mr1-dev 
* commit '8eaba6002615f2f89979a50e848c34503fd1e105':
  Disable electron beam on animation.
 2012-08-20 20:31:53 -07:00
Jeff Brown
b89ae74781 am 273f2224: am 256237c9: Merge "Plumb the switch code into Dalvik." into jb-mr1-dev 
* commit '273f22246679d85b56e0f0be79087089adbd48c0':
  Plumb the switch code into Dalvik.
 2012-08-20 20:30:40 -07:00
Jeff Brown
74e7f481a7 am bdc2f66d: am 892f371c: Merge "Encapsulate locks in UEventObservers." into jb-mr1-dev 
* commit 'bdc2f66d5ba94de887070a37c9d1de56b7cf36fa':
  Encapsulate locks in UEventObservers.
 2012-08-20 20:30:37 -07:00
Jeff Brown
8eaba60026 Merge "Disable electron beam on animation." into jb-mr1-dev 2012-08-20 20:28:50 -07:00
Jeff Brown
273f222466 am 256237c9: Merge "Plumb the switch code into Dalvik." into jb-mr1-dev 
* commit '256237c99f1d7fc32e025861c3ae7bc855db3c5a':
  Plumb the switch code into Dalvik.
 2012-08-20 20:28:37 -07:00
Jeff Brown
bdc2f66d5b am 892f371c: Merge "Encapsulate locks in UEventObservers." into jb-mr1-dev 
* commit '892f371c6b8c33268dceaeb89ac09c73ad72ad79':
  Encapsulate locks in UEventObservers.
 2012-08-20 20:28:30 -07:00
Jeff Brown
256237c99f Merge "Plumb the switch code into Dalvik." into jb-mr1-dev 2012-08-20 20:26:11 -07:00
Jeff Brown
892f371c6b Merge "Encapsulate locks in UEventObservers." into jb-mr1-dev 2012-08-20 20:25:14 -07:00
Jeff Brown
5356c7dc72 Disable electron beam on animation. 
We want the screen to come back on as soon as possible.

Change-Id: Ifdaa2e88d19590c3da53be985dd886633e5cac59
 2012-08-20 20:19:16 -07:00
Jeff Brown
5338428ddb Plumb the switch code into Dalvik. 
Bug: 6548391
Change-Id: If0e918669ba27ca0e6561930d4abc427c34de42d
 2012-08-20 20:16:01 -07:00
Jeff Brown
008b1762a8 Encapsulate locks in UEventObservers. 
Synchronized methods make me cry so fixing this first before
I introduce any new functionality that could result in a deadlock.

Bug: 6548391
Change-Id: I9c006dc491ce205bfd86acf828dcebda2a63b2ca
 2012-08-20 20:15:34 -07:00
Jeff Brown
26ed7073ac am 6fee1cba: am 4b72463d: Merge "Add factory test feature to shut off on long press power." into jb-mr1-dev 
* commit '6fee1cba4f6ed7ab28f8d0e8dad823a3d900cf9a':
  Add factory test feature to shut off on long press power.
 2012-08-20 19:45:46 -07:00
Jeff Brown
6fee1cba4f am 4b72463d: Merge "Add factory test feature to shut off on long press power." into jb-mr1-dev 
* commit '4b72463d7cb807912ca359f3b5a160f59d985c1d':
  Add factory test feature to shut off on long press power.
 2012-08-20 19:43:47 -07:00
Jeff Brown
4b72463d7c Merge "Add factory test feature to shut off on long press power." into jb-mr1-dev 2012-08-20 19:41:48 -07:00
John Reck
003caf9e43 am d87fd2e1: am c2cb8d22: Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev 
* commit 'd87fd2e136b69c0d3f0a5c9d7c923e604d0c576c':
  Support scrolling layers with the mousewheel
 2012-08-20 17:37:20 -07:00
John Reck
d87fd2e136 am c2cb8d22: Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev 
* commit 'c2cb8d226399c3cb93bad7008b4049d493d4f1d2':
  Support scrolling layers with the mousewheel
 2012-08-20 17:35:17 -07:00
John Reck
c2cb8d2263 Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev 2012-08-20 17:33:20 -07:00
John Reck
f2e6115404 Support scrolling layers with the mousewheel 
Bug: 6635437
 Fix onGenericAction to support scrolling layers.
 Calling startScrollingLayer detects if there is a layer under
 the mouse pointer, and if so switches to DRAG_LAYER_MODE. Then, calling
 doDrag will correctly handle scrolling the layer in DRAG_LAYER_MODE,
 switching out of DRAG_LAYER_MODE when we hit the end of a layer, and
 scrolling the page if there isn't a layer. It is the method used
 by the touch drag path.

Change-Id: I00be09a63c40caa8fce94134c57db0894a62fef0
 2012-08-20 17:13:47 -07:00
Brian Muramatsu
e572f5e2af am 8318cf99: am a5d5d608: Merge "add wireless charger support" into jb-mr1-dev 
* commit '8318cf99697c2911e31fb9b59ae8462637cb06bb':
  add wireless charger support
 2012-08-20 17:02:54 -07:00
Brian Muramatsu
8318cf9969 am a5d5d608: Merge "add wireless charger support" into jb-mr1-dev 
* commit 'a5d5d608ccd885d8328879dde782a8cc93b7cf4f':
  add wireless charger support
 2012-08-20 16:59:53 -07:00
Brian Muramatsu
a5d5d608cc Merge "add wireless charger support" into jb-mr1-dev 2012-08-20 16:57:14 -07:00
Baligh Uddin
c47d3537d8 am 03044208: (-s ours) am 33da458d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '030442085601a5215c4324ece9dcf5c3627b21c6':
  Import translations. DO NOT MERGE
 2012-08-20 15:48:33 -07:00
Baligh Uddin
0304420856 am 33da458d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '33da458dd832996d8b0ae945d6ab2896faff4afa':
  Import translations. DO NOT MERGE
 2012-08-20 15:45:43 -07:00
Baligh Uddin
33da458dd8 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-20 15:43:10 -07:00
Baligh Uddin
9b214269d4 Merge "Import translations. DO NOT MERGE" 2012-08-20 15:41:14 -07:00
Jean-Baptiste Queru
2cf3b2d550 am d9d10055: am 1abb7b54: am f96fcd50: am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes" 
* commit 'd9d10055326c635eaac12dbf13bfee97d88e844b':
  To avoid the JNI memory leaks in video editor codes
 2012-08-20 15:30:03 -07:00
Jean-Baptiste Queru
d9d1005532 am 1abb7b54: am f96fcd50: am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes" 
* commit '1abb7b541521d528c8d4f1ec5b79238842e1d155':
  To avoid the JNI memory leaks in video editor codes
 2012-08-20 15:28:27 -07:00
Jean-Baptiste Queru
352c7aa4f8 am 6ba73cc6: am 8bb154c2: Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev 
* commit '6ba73cc66273964c707fc638946befc5a1442700':
  Switch widget: Fix ON/OFF option update error
 2012-08-20 15:27:16 -07:00
Jean-Baptiste Queru
1abb7b5415 am f96fcd50: am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes" 
* commit 'f96fcd5095e751fc9402d8bbecdf59f53e00d854':
  To avoid the JNI memory leaks in video editor codes
 2012-08-20 15:26:53 -07:00
Jean-Baptiste Queru
6ba73cc662 am 8bb154c2: Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev 
* commit '8bb154c272dbd11922d74e882a538ea9af6cd7db':
  Switch widget: Fix ON/OFF option update error
 2012-08-20 15:25:43 -07:00
Jean-Baptiste Queru
8bb154c272 Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev 2012-08-20 15:23:16 -07:00
Jeff Brown
04d14ac636 am 3df15bf3: am ca7a9ef0: Merge "Adjust auto-brightness time constants." into jb-mr1-dev 
* commit '3df15bf37aa31971a3491bb0a045c329c0f7ed66':
  Adjust auto-brightness time constants.
 2012-08-20 15:13:55 -07:00
Jeff Brown
3df15bf37a am ca7a9ef0: Merge "Adjust auto-brightness time constants." into jb-mr1-dev 
* commit 'ca7a9ef0e52216e88d302feacf8edb766d813f5f':
  Adjust auto-brightness time constants.
 2012-08-20 15:12:02 -07:00
Jeff Brown
ca7a9ef0e5 Merge "Adjust auto-brightness time constants." into jb-mr1-dev 2012-08-20 15:09:41 -07:00
Jeff Brown
a9b904403b am 38f05e09: am 3fee5c6b: Merge "Fix some proximity sensor bugs." into jb-mr1-dev 
* commit '38f05e09bd305c5f28134c053bc29a5d5cffce65':
  Fix some proximity sensor bugs.
 2012-08-20 15:03:32 -07:00
Iliyan Malchev
904de8e4a9 am c456bf13: am 8756bd1d: Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev 
* commit 'c456bf13acbc4c0e7660705c1ab2b5acc5bc254c':
  Revert "Revert "Add timestamp in scan results""
 2012-08-20 15:01:44 -07:00
Jeff Brown
38f05e09bd am 3fee5c6b: Merge "Fix some proximity sensor bugs." into jb-mr1-dev 
* commit '3fee5c6bd8e13f8ef7e1ba1df3a8bf56ebb36221':
  Fix some proximity sensor bugs.
 2012-08-20 15:01:39 -07:00
Iliyan Malchev
c456bf13ac am 8756bd1d: Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev 
* commit '8756bd1d6b43e1724996897cf4593d5ea5b00213':
  Revert "Revert "Add timestamp in scan results""
 2012-08-20 14:59:49 -07:00
Jeff Brown
3fee5c6bd8 Merge "Fix some proximity sensor bugs." into jb-mr1-dev 2012-08-20 14:59:18 -07:00
Jean-Baptiste Queru
acbbd1142d resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev 
Change-Id: I51b1732011f31ea07087ef0898b47de8977074de
 2012-08-20 14:57:23 -07:00
Iliyan Malchev
8756bd1d6b Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev 2012-08-20 14:57:14 -07:00
Jeff Brown
9a538ee7bd Add factory test feature to shut off on long press power. 
Bug: 6847329
Change-Id: I2f4f975c3af2d13ccc06812a5a42e79032700862
 2012-08-20 14:56:57 -07:00
Benoit Goby
427af58304 am e6bc1238: am 7b7feee8: Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-dev 
* commit 'e6bc1238b7e832c4a568f6bd8a1c769dd1d173ea':
  Add UsbDebuggingManager and UsbDebuggingActivity
 2012-08-20 14:52:55 -07:00
Benoit Goby
e6bc1238b7 am 7b7feee8: Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-dev 
* commit '7b7feee80331deed883602d5861074ca66293e9c':
  Add UsbDebuggingManager and UsbDebuggingActivity
 2012-08-20 14:51:15 -07:00
Jean-Baptiste Queru
f96fcd5095 am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes" 
* commit '26f8ce83e04c4efd10c09bb83cfacdcd154d9450':
  To avoid the JNI memory leaks in video editor codes
 2012-08-20 14:50:45 -07:00