Jim Miller
995c25bbcb
Merge "split active user animation across switch."
2013-01-08 14:45:11 -08:00
Chris Wren
f41c61bc15
split active user animation across switch.
...
Bug: 7626087
Change-Id: If743a4be498c624d2c4ec91989648e8be754ee4b
2013-01-08 16:35:13 -05:00
Martijn Coenen
4cef9969f5
Merge "Don't IPC for every onPause() in NfcActivityManager."
2013-01-08 12:40:37 -08:00
Scott Main
3d5161049a
am aa516b10: am 76c28e54: am 7fc128fe: am b2039756: am e30d31c4: docs: misc bugs from external tracker
...
* commit 'aa516b10ddbca4097102a068206df17bcfb7f322':
docs: misc bugs from external tracker
2013-01-08 10:27:32 -08:00
Dianne Hackborn
7c208410d7
am 609d79a0: am c02bbfb3: am 9fae2ecc: Merge "Handle nested folder case"
...
* commit '609d79a0ddf7efadf62d6836f6b03dbfbfa7b41d':
Handle nested folder case
2013-01-08 10:27:27 -08:00
Dianne Hackborn
c1b3d21306
am 53d99836: am 26c00dec: am b2d3904b: Merge "Setting the default value for dock audio"
...
* commit '53d998368c6c6107c6d18de945f4dfee482e6f91':
Setting the default value for dock audio
2013-01-08 10:27:08 -08:00
Mikhail Naganov
2ede422695
Merge "Update JavaDoc for WebSettings.{get|set}UseWideViewPort"
2013-01-08 01:51:02 -08:00
Craig Mautner
ef6550195f
Release Session earlier, release Session later.
...
For finishDrawingWindow queue the performLayoutAndPlaceSurfaces call
and return immediately.
For setTransparentRegionHint call the WindowStateAnimator method
immediately, removing the previous queueing of it.
Fixes bug 7174665.
Change-Id: Ia52f9a6685842220e4ffca6e214ee366470ff666
2013-01-08 00:36:16 -08:00
Craig Mautner
73164dc7bc
Merge "Combine DimAnimator and DimSurface into DimLayer"
2013-01-08 00:23:46 -08:00
Craig Mautner
1420b93fa5
Combine DimAnimator and DimSurface into DimLayer
...
Replace two classes that did similar things in a complicated manner
with one class that does it more simply.
Bug 7064755 fixed.
Change-Id: I8c415671f60d1d2ece9da5916421f4d24aed2d65
2013-01-08 00:22:22 -08:00
Craig Mautner
581068131c
Remove some TODOs.
...
Change-Id: I52f5a8a76593dde177c2e931f656b13134a3bd2b
2013-01-07 23:39:11 -08:00
Craig Mautner
9a29a5d679
Convert three booleans into single state variable.
...
Make app transition states easier to understand.
Remove unnecessary dependence on ActivityOptions.
Change-Id: If3942133e919a4121340f8ef5ca1c50df22f370d
2013-01-07 23:39:10 -08:00
Craig Mautner
4b71aa1f8a
Move app transition constants
...
Move app transition constants from WindowManagerPolicy to
AppTransition.
Change-Id: I8ae6c4d0da1db826c44eb4ea0c6b85016b50b1a3
2013-01-07 23:38:57 -08:00
Romain Guy
ecba50e528
Merge "Add more tests for libhwui"
2013-01-07 18:14:36 -08:00
Romain Guy
5b4628aeea
Add more tests for libhwui
...
These tests verify the behavior when scaling paths and text
Change-Id: I0f3259175bcee93186e30296759996e0447cba99
2013-01-07 18:11:52 -08:00
Martijn Coenen
1360c555a4
Don't IPC for every onPause() in NfcActivityManager.
...
The NfcService now contains additional code to make sure
that the registered NDEF callback corresponds to the package
running in the foreground. This allows us to stop calling
the NfcService on every onPause() to register the NDEF callback,
as NfcService itself will now detect that the app is no longer
in the foreground, and won't call the callback.
Bug: 5199662
Change-Id: Ibd0d21f8c7b76346238305a6684967263cb7d7e0
2013-01-07 16:41:15 -08:00
Scott Main
aa516b10dd
am 76c28e54: am 7fc128fe: am b2039756: am e30d31c4: docs: misc bugs from external tracker
...
* commit '76c28e54b876207d468309aecb2ff2f4708a6ca4':
docs: misc bugs from external tracker
2013-01-07 16:06:40 -08:00
Scott Main
76c28e54b8
am 7fc128fe: am b2039756: am e30d31c4: docs: misc bugs from external tracker
...
* commit '7fc128fef94273b82c66bd636ff7f9fced9a68db':
docs: misc bugs from external tracker
2013-01-07 16:04:04 -08:00
Scott Main
7fc128fef9
am b2039756: am e30d31c4: docs: misc bugs from external tracker
...
* commit 'b203975610a8ebac9345aa381b008466389dfa33':
docs: misc bugs from external tracker
2013-01-07 16:01:17 -08:00
Dianne Hackborn
609d79a0dd
am c02bbfb3: am 9fae2ecc: Merge "Handle nested folder case"
...
* commit 'c02bbfb3ea64ec9f4f3e6eff796b0bfe571bda9b':
Handle nested folder case
2013-01-07 15:58:43 -08:00
Scott Main
b203975610
am e30d31c4: docs: misc bugs from external tracker
...
* commit 'e30d31c4e8439f8fa8647744cee93f1fd8b67407':
docs: misc bugs from external tracker
2013-01-07 15:58:19 -08:00
Dianne Hackborn
c02bbfb3ea
am 9fae2ecc: Merge "Handle nested folder case"
...
* commit '9fae2ecc5fb777230bde74e4a099fb4e98bf34b4':
Handle nested folder case
2013-01-07 15:56:20 -08:00
Scott Main
e30d31c4e8
docs: misc bugs from external tracker
...
Change-Id: I928659b23d1ff3a5d017d4fb50acb8ac0e3b251b
2013-01-07 15:54:30 -08:00
Dianne Hackborn
9fae2ecc5f
Merge "Handle nested folder case"
2013-01-07 15:20:45 -08:00
Baligh Uddin
f6f00b14fb
Merge "Import translations. DO NOT MERGE"
2013-01-07 14:10:14 -08:00
Dianne Hackborn
53d998368c
am 26c00dec: am b2d3904b: Merge "Setting the default value for dock audio"
...
* commit '26c00decb4c0352913396851c2b42a8705976614':
Setting the default value for dock audio
2013-01-07 13:53:12 -08:00
Dianne Hackborn
26c00decb4
am b2d3904b: Merge "Setting the default value for dock audio"
...
* commit 'b2d3904b0d0f02b3eddef1d228724b99962cba56':
Setting the default value for dock audio
2013-01-07 13:26:38 -08:00
Chris Wren
aff5a6126d
Merge "add logging to debug panel touches."
2013-01-07 12:57:50 -08:00
Dianne Hackborn
017129481b
am 449f006f: am 2a8de804: am 350d5168: Merge "Correcting typo in doc of MEDIA_XXX intents"
...
* commit '449f006f9391b8c42d6d95ba06970216e8ef9f84':
Correcting typo in doc of MEDIA_XXX intents
2013-01-07 12:24:09 -08:00
Dianne Hackborn
dff561f42b
am 9b59509c: am 138a3d3f: am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf."
...
* commit '9b59509c6a94f1943ce64d3b5e9b4de2aa846d4d':
Hopefully fix PendingIntent.getActivities() documentation wtf.
2013-01-07 12:23:59 -08:00
Dianne Hackborn
449f006f93
am 2a8de804: am 350d5168: Merge "Correcting typo in doc of MEDIA_XXX intents"
...
* commit '2a8de804a2a8313fc4571a73c625d8213237b825':
Correcting typo in doc of MEDIA_XXX intents
2013-01-07 12:20:16 -08:00
Dianne Hackborn
9b59509c6a
am 138a3d3f: am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf."
...
* commit '138a3d3f1a7990606c5aa0cb92019dac8568f3ec':
Hopefully fix PendingIntent.getActivities() documentation wtf.
2013-01-07 12:19:58 -08:00
Dianne Hackborn
b2d3904b0d
Merge "Setting the default value for dock audio"
2013-01-07 12:17:25 -08:00
Dianne Hackborn
2a8de804a2
am 350d5168: Merge "Correcting typo in doc of MEDIA_XXX intents"
...
* commit '350d5168e495c642873ee511d4e8dc27ac5377ce':
Correcting typo in doc of MEDIA_XXX intents
2013-01-07 12:16:40 -08:00
Dianne Hackborn
138a3d3f1a
am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf."
...
* commit 'd5d6f04f2ab0db0aea03e3ab1cdd378fcc952bad':
Hopefully fix PendingIntent.getActivities() documentation wtf.
2013-01-07 12:16:23 -08:00
Romain Guy
7d1c4fa322
Remove out-of-date comment and rename constant
...
Change-Id: I0c60d349505776cff0d7e5360e87ac5584dc5876
2013-01-07 11:55:27 -08:00
Romain Guy
4a62374544
Merge "Fix issue when toggling profiling from visual to off to visual"
2013-01-07 11:31:49 -08:00
Romain Guy
666d5daab2
Fix issue when toggling profiling from visual to off to visual
...
Change-Id: I4a623020a9bf0079029d184c13e58d92e692faf8
2013-01-07 11:29:14 -08:00
Chris Wren
64161ccb2f
add logging to debug panel touches.
...
Turn on gesture recorder.
Add events to the Event Log.
Bug:7686690
Change-Id: I53b7d43f5bdc002360e305182597765f3c430b11
2013-01-07 14:25:58 -05:00
Dianne Hackborn
350d5168e4
Merge "Correcting typo in doc of MEDIA_XXX intents"
2013-01-07 11:21:54 -08:00
Romain Guy
31ffc57139
Merge "Update profiling properties"
2013-01-07 11:20:20 -08:00
Dianne Hackborn
d5d6f04f2a
Merge "Hopefully fix PendingIntent.getActivities() documentation wtf."
2013-01-07 11:19:11 -08:00
Romain Guy
a4fef0260b
Update profiling properties
...
This change merges debug.hwui.profiling and profiling_visualize.
Now only the first property exists and accepts the values true, false
and visual. This enables setting the property from Settings.
Change-Id: I16a11fe23ac1a6bb907a1a826e418d6b3994b56c
2013-01-07 11:18:38 -08:00
Romain Guy
e1730e77a3
Merge "Use dp units instead of px to draw profiling graph"
2013-01-07 11:00:13 -08:00
Romain Guy
98e4a52cc0
Use dp units instead of px to draw profiling graph
...
Change-Id: Iba24b21ebe46738c6b1d6d320ce34af71f7c769d
2013-01-07 10:58:34 -08:00
Mikhail Naganov
cb000a68cb
Update JavaDoc for WebSettings.{get|set}UseWideViewPort
...
Based on a black-box inspection of WebView behavior.
Change-Id: I8823dab9ef2302cf7d11abec87a64e854db9e116
2013-01-07 17:54:19 +00:00
Alon Albert
35d67ec31a
Merge "Put some useful information in User-Agent Header"
2013-01-07 09:18:52 -08:00
Baligh Uddin
025cca9bce
Import translations. DO NOT MERGE
...
Change-Id: I95ee4260cb3815af663678cf1bee15d7e5861862
Auto-generated-cl: translation import
2013-01-07 08:59:47 -08:00
Jeff Sharkey
0ada5d656d
Merge "Expose roaming flag for testing."
2013-01-05 09:51:20 -08:00
Romain Guy
63e2098b74
Merge "Make profiling graph more readable in all apps"
2013-01-04 19:32:50 -08:00