Alan Viverette
4e17981cdc
am b198dbaf: am 013634cc: Merge "Add WebVTT caption renderer" into klp-dev
...
* commit 'b198dbaf19fcad86f81226aa06644db41d6028e4':
Add WebVTT caption renderer
2013-09-09 14:14:33 -07:00
Eric Rowe
279afa504e
am f2a24a06: am 93d71945: Merge "Add PID and application to Java crash printout" into klp-dev
...
* commit 'f2a24a0672db102008a24b2fbc207a2e489c9797':
Add PID and application to Java crash printout
2013-09-09 14:14:28 -07:00
Alan Viverette
b198dbaf19
am 013634cc: Merge "Add WebVTT caption renderer" into klp-dev
...
* commit '013634cc44d62fe90cd3e80a7530cffdc79f9715':
Add WebVTT caption renderer
2013-09-09 14:08:14 -07:00
Eric Rowe
f2a24a0672
am 93d71945: Merge "Add PID and application to Java crash printout" into klp-dev
...
* commit '93d71945d88f38b784de3c12d7ae781e97735582':
Add PID and application to Java crash printout
2013-09-09 14:08:12 -07:00
Alan Viverette
013634cc44
Merge "Add WebVTT caption renderer" into klp-dev
2013-09-09 20:31:14 +00:00
Eric Rowe
93d71945d8
Merge "Add PID and application to Java crash printout" into klp-dev
2013-09-09 19:57:20 +00:00
Tom O'Neill
6446e4595c
am a849dd62: am fb75487f: Merge "Explain what warnIfCallingFromSystemProcess() is about" into klp-dev
...
* commit 'a849dd621432c7c3d369e5cedb722d6aa00eaa06':
Explain what warnIfCallingFromSystemProcess() is about
2013-09-09 12:47:56 -07:00
Deepanshu Gupta
584b7f95a7
am d7cdc168: (-s ours) am a7127540: Merge "Add isPremultiplied option to Bitmap_Delegate in LayoutLib" into klp-dev
...
* commit 'd7cdc1682750bdae6ac38231c810fd56c7bf2ca2':
Add isPremultiplied option to Bitmap_Delegate in LayoutLib
2013-09-09 12:44:25 -07:00
Tom O'Neill
a849dd6214
am fb75487f: Merge "Explain what warnIfCallingFromSystemProcess() is about" into klp-dev
...
* commit 'fb75487f8af748feb83ce3116c4d6dcc4e819027':
Explain what warnIfCallingFromSystemProcess() is about
2013-09-09 12:44:00 -07:00
Tom O'Neill
fb75487f8a
Merge "Explain what warnIfCallingFromSystemProcess() is about" into klp-dev
2013-09-09 19:41:25 +00:00
Deepanshu Gupta
d7cdc16827
am a7127540: Merge "Add isPremultiplied option to Bitmap_Delegate in LayoutLib" into klp-dev
...
* commit 'a71275401143bc259fd5804ab6852fc3265d88b7':
Add isPremultiplied option to Bitmap_Delegate in LayoutLib
2013-09-09 12:40:27 -07:00
Deepanshu Gupta
a712754011
Merge "Add isPremultiplied option to Bitmap_Delegate in LayoutLib" into klp-dev
2013-09-09 19:35:03 +00:00
Eric Rowe
35980b2cf5
Add PID and application to Java crash printout
...
Bug: 10568405
Change-Id: I508e89bf7ea58e15a8460099036e270139b2e2a9
2013-09-09 11:40:31 -07:00
Eric Rowe
001ebe0ec6
am a130a316: am e13aa0ba: Merge "Add PID to ANR logcat printout." into klp-dev
...
* commit 'a130a3161432bd4e2f267d3de43c75c9a87c667a':
Add PID to ANR logcat printout.
2013-09-09 11:36:30 -07:00
Eric Rowe
a130a31614
am e13aa0ba: Merge "Add PID to ANR logcat printout." into klp-dev
...
* commit 'e13aa0ba99de3dfa2bc3aee1defe9972d23fcd12':
Add PID to ANR logcat printout.
2013-09-09 11:31:33 -07:00
Eric Rowe
e13aa0ba99
Merge "Add PID to ANR logcat printout." into klp-dev
2013-09-09 18:29:39 +00:00
Dirk Dougherty
fefaf0d514
am 0c7e20a7: am 4012b6ef: am cbe6482a: am b096bee1: am dd93ae32: Doc change: fix typo.
...
* commit '0c7e20a7b03bd23f22685a16508e2e1448d79b52':
Doc change: fix typo.
2013-09-09 10:55:16 -07:00
Dirk Dougherty
0c7e20a7b0
am 4012b6ef: am cbe6482a: am b096bee1: am dd93ae32: Doc change: fix typo.
...
* commit '4012b6efb801f1dbc60268a792db75536809fd16':
Doc change: fix typo.
2013-09-09 10:51:27 -07:00
Dirk Dougherty
4012b6efb8
am cbe6482a: am b096bee1: am dd93ae32: Doc change: fix typo.
...
* commit 'cbe6482a842946eaad3dc4f964ec1da10ba18b57':
Doc change: fix typo.
2013-09-09 10:48:03 -07:00
Dirk Dougherty
cbe6482a84
am b096bee1: am dd93ae32: Doc change: fix typo.
...
* commit 'b096bee155cc089144d59640494adba0b31d56ed':
Doc change: fix typo.
2013-09-09 10:45:57 -07:00
Dirk Dougherty
b096bee155
am dd93ae32: Doc change: fix typo.
...
* commit 'dd93ae32a8d50147a95a270cc99f9474dbf9ee27':
Doc change: fix typo.
2013-09-09 10:42:47 -07:00
Chet Haase
43f839c695
am f58ad4ef: am bbddd49d: Merge "Propagate pivot values of 0 to native layer" into klp-dev
...
* commit 'f58ad4ef2037317bedbd21dcd429ca050976da60':
Propagate pivot values of 0 to native layer
2013-09-09 10:41:28 -07:00
Chet Haase
82a8f3b73d
am 4f38f7a9: am b44ab987: Merge "TextChange transition now uses CharSequence instead of String" into klp-dev
...
* commit '4f38f7a93722fe8f3b4b3c8a9d06c6b77e030960':
TextChange transition now uses CharSequence instead of String
2013-09-09 10:41:25 -07:00
Chet Haase
f58ad4ef20
am bbddd49d: Merge "Propagate pivot values of 0 to native layer" into klp-dev
...
* commit 'bbddd49d6dc1b72dc81d4bb0033dea578066853e':
Propagate pivot values of 0 to native layer
2013-09-09 10:37:56 -07:00
Chet Haase
4f38f7a937
am b44ab987: Merge "TextChange transition now uses CharSequence instead of String" into klp-dev
...
* commit 'b44ab9872a0b6d325a38c79dfcae81ff5fc8622e':
TextChange transition now uses CharSequence instead of String
2013-09-09 10:37:53 -07:00
Chet Haase
bbddd49d6d
Merge "Propagate pivot values of 0 to native layer" into klp-dev
2013-09-09 17:36:48 +00:00
Dirk Dougherty
dd93ae32a8
Doc change: fix typo.
...
Change-Id: Idd14111f1b62430560a11c5803a864f2bad5eff0
2013-09-09 10:36:37 -07:00
Chet Haase
b44ab9872a
Merge "TextChange transition now uses CharSequence instead of String" into klp-dev
2013-09-09 17:36:13 +00:00
Eric Rowe
4e94f93a7d
Add PID to ANR logcat printout.
...
Bug: 10568033
Change-Id: I7131520c887df1f897b7a135b04509bdad9bdb88
2013-09-09 10:34:12 -07:00
Alan Viverette
2bd9dccc13
am 1519a158: am 23f31a1c: Merge "Only activate FastScroller when it\'s needed" into klp-dev
...
* commit '1519a1588a053eec3a3d0c8eb077e0cc12567d0b':
Only activate FastScroller when it's needed
2013-09-09 10:31:10 -07:00
Alan Viverette
9c8552320b
am 7feaba5f: am 5b068bbb: Merge "Increase visibility of accessibility focus highlight" into klp-dev
...
* commit '7feaba5f34bc3415701ef3cd8bcde91d68aa4184':
Increase visibility of accessibility focus highlight
2013-09-09 10:31:08 -07:00
Alan Viverette
fa1daf7d37
am 109753dd: am 498301d8: Merge "Add drag-to-open for action bar submenus" into klp-dev
...
* commit '109753dd83bddaad237a3df3dc4f78e792b5c88a':
Add drag-to-open for action bar submenus
2013-09-09 10:31:04 -07:00
Alan Viverette
1519a1588a
am 23f31a1c: Merge "Only activate FastScroller when it\'s needed" into klp-dev
...
* commit '23f31a1c4ed313790921427df82f36960d9e9706':
Only activate FastScroller when it's needed
2013-09-09 10:27:42 -07:00
Alan Viverette
7feaba5f34
am 5b068bbb: Merge "Increase visibility of accessibility focus highlight" into klp-dev
...
* commit '5b068bbbe2b3d66a3fbae2eb78a5502fbd160da8':
Increase visibility of accessibility focus highlight
2013-09-09 10:27:39 -07:00
Alan Viverette
109753dd83
am 498301d8: Merge "Add drag-to-open for action bar submenus" into klp-dev
...
* commit '498301d8b554f3806ddb01acd2ea98c27132a0e2':
Add drag-to-open for action bar submenus
2013-09-09 10:27:37 -07:00
Alan Viverette
23f31a1c4e
Merge "Only activate FastScroller when it's needed" into klp-dev
2013-09-09 17:24:32 +00:00
Alan Viverette
5b068bbbe2
Merge "Increase visibility of accessibility focus highlight" into klp-dev
2013-09-09 17:24:08 +00:00
Alan Viverette
498301d8b5
Merge "Add drag-to-open for action bar submenus" into klp-dev
2013-09-09 17:24:05 +00:00
Jeff Sharkey
184c4a096a
am 7c4f1492: am 30590646: Merge "Remember mode and sort on per-directory basis." into klp-dev
...
* commit '7c4f14924e465b3cbbea7a79192343c97142d9a1':
Remember mode and sort on per-directory basis.
2013-09-09 10:09:50 -07:00
Jeff Sharkey
7c4f14924e
am 30590646: Merge "Remember mode and sort on per-directory basis." into klp-dev
...
* commit '30590646d6846a4db76d416c70ee68a3f9f359b5':
Remember mode and sort on per-directory basis.
2013-09-09 10:06:37 -07:00
Jeff Sharkey
30590646d6
Merge "Remember mode and sort on per-directory basis." into klp-dev
2013-09-09 17:04:47 +00:00
Narayan Kamath
057cba6cc9
Merge "Revert "Allow SSL caches to be installed directly on SSLContexts.""
2013-09-09 16:48:30 +00:00
Amith Yamasani
25a333a762
am f0f79131: am 910adb11: Merge "Throw an exception if isValidFragment is not overridden for KK targets" into klp-dev
...
* commit 'f0f79131521eefdbae5c5da9f3c45c83960540d0':
Throw an exception if isValidFragment is not overridden for KK targets
2013-09-09 09:47:12 -07:00
Narayan Kamath
fdf4bbf2d0
Revert "Allow SSL caches to be installed directly on SSLContexts."
...
This reverts commit 25bef03cbf8d24c225b97202423dae75ed8b640f.
Breaks build with
cannot access com.android.org.conscrypt.SSLClientSessionCache
class file for com.android.org.conscrypt.SSLClientSessionCache not found
Change-Id: I6a89b45d5e8c7547778d7485ed02006cd4679989
2013-09-09 16:47:08 +00:00
Amith Yamasani
f0f7913152
am 910adb11: Merge "Throw an exception if isValidFragment is not overridden for KK targets" into klp-dev
...
* commit '910adb11abc84bf4a113ac130c3998082cc84294':
Throw an exception if isValidFragment is not overridden for KK targets
2013-09-09 09:45:10 -07:00
Amith Yamasani
910adb11ab
Merge "Throw an exception if isValidFragment is not overridden for KK targets" into klp-dev
2013-09-09 16:43:16 +00:00
Tom O'Neill
365632e8ee
Explain what warnIfCallingFromSystemProcess() is about
...
- Helps the next person to hit a bug like b/10621831
Change-Id: Id44dc57472516ec5f574d22d4c131ab9870648db
2013-09-09 09:34:58 -07:00
Jeff Sharkey
d182bb641f
Remember mode and sort on per-directory basis.
...
Persist the last user-selected list/grid mode and sort order for
each directory. Remembered user choice always overrides provider
hinting.
Filter out recent documents that don't match requested MIME type, and
show recents in grid mode when picking images. Hide mode and sort
order in recents.
Add hinting flag for backend to indicate a directory would like to be
sorted by last modified. Include explicit root in DocumentStack and
clearly mark derived fields.
Bug: 10392047, 10608506
Change-Id: I2dd3a0e4112852ebf87e7dbb08b3781c86587dcf
2013-09-09 09:16:09 -07:00
Narayan Kamath
25bef03cbf
Allow SSL caches to be installed directly on SSLContexts.
...
This allows clients to enable ssl session caching without
having to use SSLCertificateSocketFactory.
Change-Id: Ibfb4b99fa86bc0704674437d9b860531317d2bde
2013-09-09 16:07:07 +00:00
Chet Haase
183e2a351d
Propagate pivot values of 0 to native layer
...
Logic in pivotXY setters noops when the new value equals
the previous value. However, the initial value is "0" even
though we actually use a value of the view's midpoint by
default. If an app sets a new value of 0, we don't send it
down to the native layer because it's the same as the initial
value, even though we're actually using a midpoint value instead.
This causes a conflict between the matrix used for invalidations
(which use the actual values the app set) and the matrix used
for rendering (which uses the default midpoint values).
The fix is to make sure we send down the initial value, even when it
equals the default value, by checking to see whether this is the
first time we're setting the pivot.
Issue #9337635 Clipping and bad rendering of view corners when y pivot is set
Change-Id: I4aa20c4a3c9a866ca17df3e067232b832d0ef504
2013-09-09 08:39:35 -07:00