OSDN Git Service
Selim Gurun [Tue, 21 Aug 2012 23:15:23 +0000 (16:15 -0700)]
am
a6d16993: Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev
* commit '
a6d16993eb6b8834095b8e308523b2d28259e430':
Small tidy up to getDefaultUserAgent. DO NOT MERGE
Selim Gurun [Tue, 21 Aug 2012 23:12:55 +0000 (16:12 -0700)]
Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev
Selim Gurun [Tue, 21 Aug 2012 23:08:34 +0000 (16:08 -0700)]
am
b62999c1: Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE" into jb-mr1-dev
* commit '
b62999c136802f5ab0b95308b3751702d72afcb8':
Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE
Jonathan Dixon [Mon, 20 Aug 2012 23:37:15 +0000 (16:37 -0700)]
Small tidy up to getDefaultUserAgent. DO NOT MERGE
- no need for WebSettings to bounce via WebView to get to the factory
- move this static (non-factory) method into the Statics inner class.
Bug:
6329117
Clean cherry pick:
d1c4faa5a4c2be71d529d35572c5f807beee7ddc
Change-Id: I96807df0171c7308421ca8811cfcb1bf710cb007
Selim Gurun [Tue, 21 Aug 2012 23:06:04 +0000 (16:06 -0700)]
Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE" into jb-mr1-dev
Stephen Hines [Tue, 21 Aug 2012 23:04:37 +0000 (16:04 -0700)]
am
cdb05977: Merge "Switch to v8 (and appropriate llvm-rs-cc stuff)." into jb-mr1-dev
* commit '
cdb05977acede73c1362e8365a196839078fc896':
Switch to v8 (and appropriate llvm-rs-cc stuff).
Stephen Hines [Tue, 21 Aug 2012 23:01:30 +0000 (16:01 -0700)]
Merge "Switch to v8 (and appropriate llvm-rs-cc stuff)." into jb-mr1-dev
Mikhail Naganov [Tue, 7 Aug 2012 17:26:52 +0000 (18:26 +0100)]
Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE
TextSize is deprecated, so we wouldn't expect from WebViewProvider
implementations to re-implement it in some other way than Android WebView does
it. This also makes recently added TextSize.getValue method redundant.
Clean cherry pick:
1202d66f78fb24850b997e37f0ce3cb3b36e4bbf
Change-Id: Ib6aecb187f10ac3ec5d12cb839cb814ec0c564fe
Dianne Hackborn [Tue, 21 Aug 2012 22:45:32 +0000 (15:45 -0700)]
am
b4f56b5e: am
8b97ee6d: am
b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
* commit '
b4f56b5ea23325a492b61989a94a738be0fe9b8b':
ActivityThread: Avoid creating duplicate handlers and reuse mH
Dianne Hackborn [Tue, 21 Aug 2012 22:42:42 +0000 (15:42 -0700)]
am
8b97ee6d: am
b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
* commit '
8b97ee6d8c26974a6fc9ce85c3d7a07ca1e9cac2':
ActivityThread: Avoid creating duplicate handlers and reuse mH
Dianne Hackborn [Tue, 21 Aug 2012 22:39:42 +0000 (15:39 -0700)]
am
b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
* commit '
b0b4a704400319ceaa1002f3194a40553a00cc82':
ActivityThread: Avoid creating duplicate handlers and reuse mH
Craig Mautner [Tue, 21 Aug 2012 22:33:41 +0000 (15:33 -0700)]
am
7e877fa0: Merge "Fix to allow SYSTEM_UID to display windows." into jb-mr1-dev
* commit '
7e877fa00c6b093a0fe734e5d3bf23b5b2d6411e':
Fix to allow SYSTEM_UID to display windows.
Craig Mautner [Tue, 21 Aug 2012 22:30:41 +0000 (15:30 -0700)]
Merge "Fix to allow SYSTEM_UID to display windows." into jb-mr1-dev
Craig Mautner [Tue, 21 Aug 2012 22:12:20 +0000 (15:12 -0700)]
Fix to allow SYSTEM_UID to display windows.
Was not previously checking to make sure that the appId was not
SYSTEM_UID (1000). This caused certain system windows to fail to
appear.
Change-Id: I939dc2f8a256acb84b7c413c7e00003a89aff6d4
Dianne Hackborn [Tue, 21 Aug 2012 22:12:45 +0000 (15:12 -0700)]
Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
Craig Mautner [Tue, 21 Aug 2012 21:29:07 +0000 (14:29 -0700)]
am
de1d96c7: Merge "Hide non user app windows from other users." into jb-mr1-dev
* commit '
de1d96c736730c2a99a225311b9211a34042f9d4':
Hide non user app windows from other users.
Craig Mautner [Tue, 21 Aug 2012 21:26:28 +0000 (14:26 -0700)]
Merge "Hide non user app windows from other users." into jb-mr1-dev
Amith Yamasani [Tue, 21 Aug 2012 21:22:14 +0000 (14:22 -0700)]
am
23e28255: Merge "Multiprocess activity should be allowed to run on current user" into jb-mr1-dev
* commit '
23e282554ee0ddff80fd5bd2f47d5fb37b3b02c5':
Multiprocess activity should be allowed to run on current user
Teng-Hui Zhu [Tue, 21 Aug 2012 21:20:35 +0000 (14:20 -0700)]
am
2253eeab: Add context support into the filter framework.
* commit '
2253eeab6c0c20e0b03f144c5bc23ae13e8ab234':
Add context support into the filter framework.
Amith Yamasani [Tue, 21 Aug 2012 21:19:51 +0000 (14:19 -0700)]
Merge "Multiprocess activity should be allowed to run on current user" into jb-mr1-dev
Teng-Hui Zhu [Tue, 7 Aug 2012 00:24:10 +0000 (17:24 -0700)]
Add context support into the filter framework.
Basically we need the context to pass the content URI into MediaPlayer.
bug:
6837809
Change-Id: I9390b57baff06f80246584fb3a4b746e1a308ff2
Jean-Baptiste Queru [Tue, 21 Aug 2012 21:03:34 +0000 (14:03 -0700)]
am
02df84a3: am
34d85746: am
b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()"
* commit '
02df84a3b1b4f68044d981bb345515ae9419d0c1':
Tests/RS: Add RS context check for RsBalls setAccel()
Jean-Baptiste Queru [Tue, 21 Aug 2012 21:02:02 +0000 (14:02 -0700)]
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()
Jean-Baptiste Queru [Tue, 21 Aug 2012 21:00:11 +0000 (14:00 -0700)]
am
b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()"
* commit '
b8da225f26b689288710ff0eafefa906b4f5700f':
Tests/RS: Add RS context check for RsBalls setAccel()
Nick Pelly [Tue, 21 Aug 2012 20:55:23 +0000 (13:55 -0700)]
am
257662ef: Merge "Print timestamp (instead of age) in Location#toString()" into jb-mr1-dev
* commit '
257662efe2a5edd13601b4372b5c1ff0431ddda9':
Print timestamp (instead of age) in Location#toString()
Nick Pelly [Tue, 21 Aug 2012 20:53:04 +0000 (13:53 -0700)]
Merge "Print timestamp (instead of age) in Location#toString()" into jb-mr1-dev
Nick Pelly [Mon, 20 Aug 2012 21:40:24 +0000 (14:40 -0700)]
Print timestamp (instead of age) in Location#toString()
Age was a bad idea, since it depends when toString() was called
Change-Id: Ica0b6bfa9a93b5a452ba3def5fbb2b0a0194c401
Scott Anderson [Tue, 21 Aug 2012 20:37:11 +0000 (13:37 -0700)]
am
ccc7b98e: Merge "BatteryService: Fix comment to match code" into jb-mr1-dev
* commit '
ccc7b98eaf6b7067d3585661e690121fa1430feb':
BatteryService: Fix comment to match code
Scott Anderson [Tue, 21 Aug 2012 20:34:47 +0000 (13:34 -0700)]
Merge "BatteryService: Fix comment to match code" into jb-mr1-dev
Jim Miller [Tue, 21 Aug 2012 20:22:02 +0000 (13:22 -0700)]
am
f6449761: Merge "Update AppWidgetHost with better support for OnClickHandlers" into jb-mr1-dev
* commit '
f644976101e45a7801b58cea1d86f5e1744046ec':
Update AppWidgetHost with better support for OnClickHandlers
Jim Miller [Tue, 21 Aug 2012 20:19:31 +0000 (13:19 -0700)]
Merge "Update AppWidgetHost with better support for OnClickHandlers" into jb-mr1-dev
Scott Anderson [Tue, 21 Aug 2012 20:01:58 +0000 (13:01 -0700)]
BatteryService: Fix comment to match code
Change-Id: Ib4e30e7808ff3a2a8a49c000eac719a3a4273fdd
Signed-off-by: Scott Anderson <saa@android.com>
Jean-Baptiste Queru [Tue, 21 Aug 2012 20:09:18 +0000 (13:09 -0700)]
Merge "Tests/RS: Add RS context check for RsBalls setAccel()"
Chet Haase [Tue, 21 Aug 2012 20:06:27 +0000 (13:06 -0700)]
am
66bcbb9e: Merge "Fix notification panel bug which prevented proper resizing" into jb-mr1-dev
* commit '
66bcbb9e39f6c877210e7aa46b8e5d38fd79070a':
Fix notification panel bug which prevented proper resizing
Chet Haase [Tue, 21 Aug 2012 20:03:49 +0000 (13:03 -0700)]
Merge "Fix notification panel bug which prevented proper resizing" into jb-mr1-dev
Baligh Uddin [Tue, 21 Aug 2012 19:23:01 +0000 (12:23 -0700)]
am
df5c3a54: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
df5c3a54c7e955fb89951b63ff49f275a53f9c35':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 21 Aug 2012 19:19:53 +0000 (12:19 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Irfan Sheriff [Tue, 21 Aug 2012 18:50:02 +0000 (11:50 -0700)]
am
5e8e41e4: Merge "Fix NPE" into jb-mr1-dev
* commit '
5e8e41e41aecd2a4951659a1f3507f3371e0cc47':
Fix NPE
Irfan Sheriff [Tue, 21 Aug 2012 18:47:18 +0000 (11:47 -0700)]
Merge "Fix NPE" into jb-mr1-dev
Maxim Siniavine [Tue, 21 Aug 2012 18:45:20 +0000 (11:45 -0700)]
am
88cb79e7: Merge "Added a test to measure memory usage of apps." into jb-mr1-dev
* commit '
88cb79e7a168b653c9678809da67f55607ec4006':
Added a test to measure memory usage of apps.
Irfan Sheriff [Tue, 21 Aug 2012 18:44:01 +0000 (11:44 -0700)]
Fix NPE
Bug:
7026244
Change-Id: I21f13bdbd2d33f0cc082f85474229d9909eb47c1
Maxim Siniavine [Tue, 21 Aug 2012 18:43:07 +0000 (11:43 -0700)]
Merge "Added a test to measure memory usage of apps." into jb-mr1-dev
Maxim Siniavine [Fri, 17 Aug 2012 21:17:06 +0000 (14:17 -0700)]
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
Baligh Uddin [Tue, 21 Aug 2012 18:22:39 +0000 (11:22 -0700)]
am
848bde26: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
848bde2688e9b44dffd0d8b7c7428602b7db451e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 21 Aug 2012 18:19:47 +0000 (11:19 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Dianne Hackborn [Tue, 21 Aug 2012 18:19:20 +0000 (11:19 -0700)]
am
d4ec5ae5: Merge "Improve multi-user app management." into jb-mr1-dev
* commit '
d4ec5ae504b11aab18fc0e60e7fc142f85aee5c1':
Improve multi-user app management.
Dianne Hackborn [Tue, 21 Aug 2012 18:17:11 +0000 (11:17 -0700)]
Merge "Improve multi-user app management." into jb-mr1-dev
Baligh Uddin [Tue, 21 Aug 2012 17:43:48 +0000 (10:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie9c95838e61ce5fffd21db7cd63f393a7ec2735e
Auto-generated-cl: translation import
Dianne Hackborn [Tue, 21 Aug 2012 00:23:30 +0000 (17:23 -0700)]
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
Baligh Uddin [Tue, 21 Aug 2012 17:22:53 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3b4b81ee8d14c074583f9ca030da42a28bba25c4
Auto-generated-cl: translation import
Amith Yamasani [Tue, 21 Aug 2012 16:49:53 +0000 (09:49 -0700)]
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
Guang Zhu [Tue, 21 Aug 2012 04:14:52 +0000 (21:14 -0700)]
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"
Guang Zhu [Tue, 21 Aug 2012 04:10:39 +0000 (21:10 -0700)]
Merge "Revert "fix sdcard path for webkit perf and layout test scripts"" into jb-mr1-dev
Guang Zhu [Tue, 21 Aug 2012 04:09:28 +0000 (21:09 -0700)]
Revert "fix sdcard path for webkit perf and layout test scripts"
This reverts commit
8aaa32b13e565893c57059ca14eb49fbe4bdf0ba
Change-Id: I831eb07943c85bb23b43bdf2d9026bf88ed23c5a
Jeff Brown [Tue, 21 Aug 2012 03:31:53 +0000 (20:31 -0700)]
am
8eaba600: Merge "Disable electron beam on animation." into jb-mr1-dev
* commit '
8eaba6002615f2f89979a50e848c34503fd1e105':
Disable electron beam on animation.
Jeff Brown [Tue, 21 Aug 2012 03:28:50 +0000 (20:28 -0700)]
Merge "Disable electron beam on animation." into jb-mr1-dev
Jeff Brown [Tue, 21 Aug 2012 03:28:37 +0000 (20:28 -0700)]
am
256237c9: Merge "Plumb the switch code into Dalvik." into jb-mr1-dev
* commit '
256237c99f1d7fc32e025861c3ae7bc855db3c5a':
Plumb the switch code into Dalvik.
Jeff Brown [Tue, 21 Aug 2012 03:28:30 +0000 (20:28 -0700)]
am
892f371c: Merge "Encapsulate locks in UEventObservers." into jb-mr1-dev
* commit '
892f371c6b8c33268dceaeb89ac09c73ad72ad79':
Encapsulate locks in UEventObservers.
Jeff Brown [Tue, 21 Aug 2012 03:25:52 +0000 (20:25 -0700)]
Merge "Plumb the switch code into Dalvik." into jb-mr1-dev
Jeff Brown [Tue, 21 Aug 2012 03:25:14 +0000 (20:25 -0700)]
Merge "Encapsulate locks in UEventObservers." into jb-mr1-dev
Jeff Brown [Tue, 21 Aug 2012 03:17:36 +0000 (20:17 -0700)]
Disable electron beam on animation.
We want the screen to come back on as soon as possible.
Change-Id: Ifdaa2e88d19590c3da53be985dd886633e5cac59
Jeff Brown [Tue, 21 Aug 2012 03:16:01 +0000 (20:16 -0700)]
Plumb the switch code into Dalvik.
Bug:
6548391
Change-Id: If0e918669ba27ca0e6561930d4abc427c34de42d
Jeff Brown [Tue, 21 Aug 2012 03:15:34 +0000 (20:15 -0700)]
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
Jeff Brown [Tue, 21 Aug 2012 02:43:47 +0000 (19:43 -0700)]
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.
Jeff Brown [Tue, 21 Aug 2012 02:41:48 +0000 (19:41 -0700)]
Merge "Add factory test feature to shut off on long press power." into jb-mr1-dev
Chet Haase [Tue, 21 Aug 2012 00:34:33 +0000 (17:34 -0700)]
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
John Reck [Tue, 21 Aug 2012 00:35:17 +0000 (17:35 -0700)]
am
c2cb8d22: Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev
* commit '
c2cb8d226399c3cb93bad7008b4049d493d4f1d2':
Support scrolling layers with the mousewheel
John Reck [Tue, 21 Aug 2012 00:33:19 +0000 (17:33 -0700)]
Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev
John Reck [Tue, 21 Aug 2012 00:13:47 +0000 (17:13 -0700)]
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
Brian Muramatsu [Mon, 20 Aug 2012 23:59:53 +0000 (16:59 -0700)]
am
a5d5d608: Merge "add wireless charger support" into jb-mr1-dev
* commit '
a5d5d608ccd885d8328879dde782a8cc93b7cf4f':
add wireless charger support
Brian Muramatsu [Mon, 20 Aug 2012 23:57:13 +0000 (16:57 -0700)]
Merge "add wireless charger support" into jb-mr1-dev
Craig Mautner [Mon, 6 Aug 2012 21:15:42 +0000 (14:15 -0700)]
Hide non user app windows from other users.
When transitioning between old user and new user application windows
from the old user may not be shown because only one user's windows
can be shown at a time.
Change-Id: I4e17b36c9100c9457cc6eb3cb3b77f3a94fa2b41
Baligh Uddin [Mon, 20 Aug 2012 22:45:43 +0000 (15:45 -0700)]
am
33da458d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
33da458dd832996d8b0ae945d6ab2896faff4afa':
Import translations. DO NOT MERGE
Jim Miller [Fri, 10 Aug 2012 02:22:32 +0000 (19:22 -0700)]
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
Baligh Uddin [Mon, 20 Aug 2012 22:43:10 +0000 (15:43 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Jean-Baptiste Queru [Mon, 20 Aug 2012 22:28:27 +0000 (15:28 -0700)]
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
Jean-Baptiste Queru [Mon, 20 Aug 2012 22:26:53 +0000 (15:26 -0700)]
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
Jean-Baptiste Queru [Mon, 20 Aug 2012 22:25:43 +0000 (15:25 -0700)]
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
Jean-Baptiste Queru [Mon, 20 Aug 2012 22:23:16 +0000 (15:23 -0700)]
Merge "resolved conflicts for merge of
4ea6a8eb to jb-mr1-dev" into jb-mr1-dev
Jeff Brown [Mon, 20 Aug 2012 22:12:02 +0000 (15:12 -0700)]
am
ca7a9ef0: Merge "Adjust auto-brightness time constants." into jb-mr1-dev
* commit '
ca7a9ef0e52216e88d302feacf8edb766d813f5f':
Adjust auto-brightness time constants.
Jeff Brown [Mon, 20 Aug 2012 22:09:41 +0000 (15:09 -0700)]
Merge "Adjust auto-brightness time constants." into jb-mr1-dev
Jeff Brown [Mon, 20 Aug 2012 22:01:39 +0000 (15:01 -0700)]
am
3fee5c6b: Merge "Fix some proximity sensor bugs." into jb-mr1-dev
* commit '
3fee5c6bd8e13f8ef7e1ba1df3a8bf56ebb36221':
Fix some proximity sensor bugs.
Iliyan Malchev [Mon, 20 Aug 2012 21:59:49 +0000 (14:59 -0700)]
am
8756bd1d: Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev
* commit '
8756bd1d6b43e1724996897cf4593d5ea5b00213':
Revert "Revert "Add timestamp in scan results""
Jeff Brown [Mon, 20 Aug 2012 21:59:18 +0000 (14:59 -0700)]
Merge "Fix some proximity sensor bugs." into jb-mr1-dev
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:57:23 +0000 (14:57 -0700)]
resolved conflicts for merge of
4ea6a8eb to jb-mr1-dev
Change-Id: I51b1732011f31ea07087ef0898b47de8977074de
Iliyan Malchev [Mon, 20 Aug 2012 21:57:14 +0000 (14:57 -0700)]
Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev
Jeff Brown [Mon, 20 Aug 2012 21:56:57 +0000 (14:56 -0700)]
Add factory test feature to shut off on long press power.
Bug:
6847329
Change-Id: I2f4f975c3af2d13ccc06812a5a42e79032700862
Benoit Goby [Mon, 20 Aug 2012 21:51:15 +0000 (14:51 -0700)]
am
7b7feee8: Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-dev
* commit '
7b7feee80331deed883602d5861074ca66293e9c':
Add UsbDebuggingManager and UsbDebuggingActivity
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:50:45 +0000 (14:50 -0700)]
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
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:50:40 +0000 (14:50 -0700)]
am
f515c6f4: Merge "Switch widget: Fix ON/OFF option update error"
* commit '
f515c6f4fe4457de1d5c49f78f9dcf6e4379e335':
Switch widget: Fix ON/OFF option update error
Benoit Goby [Mon, 20 Aug 2012 21:48:11 +0000 (14:48 -0700)]
Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-dev
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:29:51 +0000 (14:29 -0700)]
Merge "To avoid the JNI memory leaks in video editor codes"
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:28:32 +0000 (14:28 -0700)]
Merge "Switch widget: Fix ON/OFF option update error"
rich cannings [Mon, 20 Aug 2012 21:27:00 +0000 (14:27 -0700)]
am
a811e084: Merge "Pass URLs to package verifiers" into jb-mr1-dev
* commit '
a811e0848dc28f73e31a3f84d8ceca3b1f504b52':
Pass URLs to package verifiers
rich cannings [Mon, 20 Aug 2012 21:24:49 +0000 (14:24 -0700)]
Merge "Pass URLs to package verifiers" into jb-mr1-dev
Kenny Root [Mon, 20 Aug 2012 21:24:11 +0000 (14:24 -0700)]
am
672cfdc5: Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev
* commit '
672cfdc5b6194a416eae93f5ebe82cb624e2add6':
Add AndroidKeyStore provider for KeyStore API
Kenny Root [Mon, 20 Aug 2012 21:20:31 +0000 (14:20 -0700)]
Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev
Jeff Brown [Mon, 20 Aug 2012 21:02:12 +0000 (14:02 -0700)]
Adjust auto-brightness time constants.
Specifically, dim a little more slowly.
Change-Id: I10d66a83ddc3a63f8c93d740a0cb116e6c974d10
Benoit Goby [Thu, 26 Apr 2012 01:06:00 +0000 (18:06 -0700)]
Add UsbDebuggingManager and UsbDebuggingActivity
The UsbDebuggingManager listens to adbd requests and displays a dialog
when the public key authentification fails, for the user to confirm if it
wants to allow USB debugging from the attached host. If the user chooses
to always allow USB debugging, the UsbDebuggingManager writes the public
key to adbd's config file so that the public key authenfication succeeds
next time.
Change-Id: I115c828331d8e326c380844ee33915d5dff22260
George Mount [Mon, 20 Aug 2012 20:40:34 +0000 (13:40 -0700)]
am
9af67e8f: Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev
* commit '
9af67e8f6c7dd98baa6232ff2cda97510b827637':
Add getDefaultUserAgent to WebSettings.