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

83131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
23e282554e Merge "Multiprocess activity should be allowed to run on current user" into jb-mr1-dev 2012-08-21 14:19:51 -07:00
Teng-Hui Zhu
2253eeab6c Add context support into the filter framework. 
Basically we need the context to pass the content URI into MediaPlayer.
bug:6837809

Change-Id: I9390b57baff06f80246584fb3a4b746e1a308ff2
 2012-08-21 14:17:02 -07:00
Jean-Baptiste Queru
02df84a3b1 am 34d85746: am b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()" 
* commit '34d8574665caaef52f7c595b57f45f1c9efd7e39':
  Tests/RS: Add RS context check for RsBalls setAccel()
 2012-08-21 14:02:02 -07:00
Jean-Baptiste Queru
34d8574665 am b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()" 
* commit 'b8da225f26b689288710ff0eafefa906b4f5700f':
  Tests/RS: Add RS context check for RsBalls setAccel()
 2012-08-21 14:00:11 -07:00
Nick Pelly
257662efe2 Merge "Print timestamp (instead of age) in Location#toString()" into jb-mr1-dev 2012-08-21 13:53:04 -07:00
Nick Pelly
5584b497b7 Print timestamp (instead of age) in Location#toString() 
Age was a bad idea, since it depends when toString() was called

Change-Id: Ica0b6bfa9a93b5a452ba3def5fbb2b0a0194c401
 2012-08-21 13:52:20 -07:00
Scott Anderson
ccc7b98eaf Merge "BatteryService: Fix comment to match code" into jb-mr1-dev 2012-08-21 13:34:48 -07:00
Jim Miller
f644976101 Merge "Update AppWidgetHost with better support for OnClickHandlers" into jb-mr1-dev 2012-08-21 13:19:31 -07:00
Scott Anderson
5ad9fc2182 BatteryService: Fix comment to match code 
Change-Id: Ib4e30e7808ff3a2a8a49c000eac719a3a4273fdd
Signed-off-by: Scott Anderson <saa@android.com>
 2012-08-21 13:11:26 -07:00
Jean-Baptiste Queru
b8da225f26 Merge "Tests/RS: Add RS context check for RsBalls setAccel()" 2012-08-21 13:09:19 -07:00
Chet Haase
66bcbb9e39 Merge "Fix notification panel bug which prevented proper resizing" into jb-mr1-dev 2012-08-21 13:03:49 -07:00
Baligh Uddin
df5c3a54c7 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-21 12:19:53 -07:00
Irfan Sheriff
5e8e41e41a Merge "Fix NPE" into jb-mr1-dev 2012-08-21 11:47:19 -07:00
Irfan Sheriff
06d371f87b Fix NPE 
Bug: 7026244
Change-Id: I21f13bdbd2d33f0cc082f85474229d9909eb47c1
 2012-08-21 11:44:01 -07:00
Maxim Siniavine
88cb79e7a1 Merge "Added a test to measure memory usage of apps." into jb-mr1-dev 2012-08-21 11:43:07 -07:00
Maxim Siniavine
9229700728 Added a test to measure memory usage of apps. 
Each app uses a certain amount of memory when running in the
foreground. This test takes a list of app on the command line
starts them one at a time and reports the total PSS of the
app's process. The test allows to monitor memory usage over time.

Change-Id: I3411bd96cf7c7af10acbb8deeb9936469b810ea2
 2012-08-21 11:31:44 -07:00
Baligh Uddin
848bde2688 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-21 11:19:47 -07:00
Dianne Hackborn
d4ec5ae504 Merge "Improve multi-user app management." into jb-mr1-dev 2012-08-21 11:17:12 -07:00
Baligh Uddin
11780f2f66 Import translations. DO NOT MERGE 
Change-Id: Ie9c95838e61ce5fffd21db7cd63f393a7ec2735e
Auto-generated-cl: translation import
 2012-08-21 10:43:48 -07:00
Dianne Hackborn
0c38049502 Improve multi-user app management. 
Introduce API to get per-user storage information, keep track
of services associated with users, and various small cleanup.

Change-Id: I5d4e784e7ff3cccfed627d66a090d2f464202634
 2012-08-21 10:34:20 -07:00
Baligh Uddin
11cc42e968 Import translations. DO NOT MERGE 
Change-Id: I3b4b81ee8d14c074583f9ca030da42a28bba25c4
Auto-generated-cl: translation import
 2012-08-21 10:22:53 -07:00
Amith Yamasani
a10d1aa6c7 Multiprocess activity should be allowed to run on current user 
Multiprocess flag should override singleton checks.

This allows ChooserActivity to run in the process/user that launched it.
Wallpaper chooser from Launcher now works for secondary users.

Change-Id: I17a99278ed2a6d2491c3016a549134a85bc2af00
 2012-08-21 09:51:13 -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
8eaba60026 Merge "Disable electron beam on animation." into jb-mr1-dev 2012-08-20 20:28:50 -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
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
Chet Haase
179ec6d0bc Fix notification panel bug which prevented proper resizing 
When the notification panel is opened larger than the list's length,
the penl is put into a "rubber band" mode, to animate the bottom of the
panel back to the end of the list. But the rubber band mode is never
unset, which causes an improper result if another notification is ended,
preventing the panel from resizing to the new, appropriate size of the list.

Fix is to unset the rubber banding flag when the snapping animation finishes.

Issue #6992133 Notification bar does not drop down completely in Mako

Change-Id: Id93918086353f58d6eb6bb071556f08eb2e2706e
 2012-08-20 17:38:29 -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
a5d5d608cc Merge "add wireless charger support" into jb-mr1-dev 2012-08-20 16:57:14 -07:00
Jim Miller
e667a7add4 Update AppWidgetHost with better support for OnClickHandlers 
This updates AppWidgetHost and AppWidgetHostView to do a better
job at refreshing widgets and their host views.  It now allows
an OnClickHandler to be specified when creating the AppWidgetHost
which allows it to correctly update AppWidgetHostViews when needed.

Change-Id: I710c1d00a8d145bf3a9fd5f5691885bec9d1c7e4
 2012-08-20 15:44:05 -07:00
Baligh Uddin
33da458dd8 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-20 15:43:10 -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
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
ca7a9ef0e5 Merge "Adjust auto-brightness time constants." into jb-mr1-dev 2012-08-20 15:09:41 -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
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
Jean-Baptiste Queru
4ea6a8eb9f am f515c6f4: Merge "Switch widget: Fix ON/OFF option update error" 
* commit 'f515c6f4fe4457de1d5c49f78f9dcf6e4379e335':
  Switch widget: Fix ON/OFF option update error
 2012-08-20 14:50:40 -07:00
Benoit Goby
7b7feee803 Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-dev 2012-08-20 14:48:11 -07:00
Jean-Baptiste Queru
26f8ce83e0 Merge "To avoid the JNI memory leaks in video editor codes" 2012-08-20 14:29:51 -07:00
Jean-Baptiste Queru
f515c6f4fe Merge "Switch widget: Fix ON/OFF option update error" 2012-08-20 14:28:33 -07:00
rich cannings
a811e0848d Merge "Pass URLs to package verifiers" into jb-mr1-dev 2012-08-20 14:24:49 -07:00