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
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
John Spurlock
a79b1a1aed
am e381de99: am 0c58bd97: Merge "Restore alpha animation to status bar rhs icons." into klp-dev
...
* commit 'e381de995d128e5fd2a83d944a00f4030618a75f':
Restore alpha animation to status bar rhs icons.
2013-09-09 08:22:28 -07:00
John Spurlock
e381de995d
am 0c58bd97: Merge "Restore alpha animation to status bar rhs icons." into klp-dev
...
* commit '0c58bd97384498be14aa9795be9188ca93110e00':
Restore alpha animation to status bar rhs icons.
2013-09-09 08:19:51 -07:00
John Spurlock
3b6161b0a3
am 352d721b: am eef03831: Merge "Draw status bar battery icon bolt in code." into klp-dev
...
* commit '352d721b612bf35b1c64249705d00ad2f3899031':
Draw status bar battery icon bolt in code.
2013-09-09 08:18:59 -07:00
John Spurlock
0c58bd9738
Merge "Restore alpha animation to status bar rhs icons." into klp-dev
2013-09-09 15:17:42 +00:00
John Spurlock
352d721b61
am eef03831: Merge "Draw status bar battery icon bolt in code." into klp-dev
...
* commit 'eef03831fdde5a89b88451bcf12274697fe1db99':
Draw status bar battery icon bolt in code.
2013-09-09 08:16:23 -07:00
John Spurlock
eef03831fd
Merge "Draw status bar battery icon bolt in code." into klp-dev
2013-09-09 15:13:40 +00:00
Wink Saville
3553be2bff
am a71947ff: am bdd61696: Merge "Tighten test for warm sim and add more debug." into klp-dev
...
* commit 'a71947ff7f28686f0f0fdc0586d85718e1a62352':
Tighten test for warm sim and add more debug.
2013-09-09 02:48:37 -07:00
Wink Saville
9772a5015b
am 42b3a6a7: am c59c6dd6: Merge "For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA default to PHONE_TYPE_GSM" into klp-dev
...
* commit '42b3a6a7be0201cb40fb1c36f97476c775be0cf1':
For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA default to PHONE_TYPE_GSM
2013-09-09 02:48:33 -07:00
Christopher Tate
8474ae7df0
am 6b86ac70: am ffe0a803: Fix permission checks around setBackupEnabled()
...
* commit '6b86ac70460c2fc393159fa7a88d14460a917117':
Fix permission checks around setBackupEnabled()
2013-09-09 02:48:30 -07:00
Narayan Kamath
451f6b981a
resolved conflicts for merge of d4ff4b64 to master
...
Change-Id: I0bcc072908164ca2aa80e991c03e739551e278c5
2013-09-09 10:27:30 +01:00
Christopher Tate
be8e9ff7ed
am bb595190: am 89c5a118: Merge "Don\'t crash attempting restore of uninstalled live wallpaper" into klp-dev
...
* commit 'bb595190242a5405c0a6f0470532407543d6e00b':
Don't crash attempting restore of uninstalled live wallpaper
2013-09-09 02:24:46 -07:00
Narayan Kamath
0033539a43
resolved conflicts for merge of ab98aec6 to master
...
Change-Id: I773bce338ebc42f7428d9942d22ed140bcfbf3d9
2013-09-09 09:59:31 +01:00
Wink Saville
a71947ff7f
am bdd61696: Merge "Tighten test for warm sim and add more debug." into klp-dev
...
* commit 'bdd61696c6720faa14ca9fdf180e519138b3d087':
Tighten test for warm sim and add more debug.
2013-09-08 18:34:11 -07:00
Wink Saville
42b3a6a7be
am c59c6dd6: Merge "For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA default to PHONE_TYPE_GSM" into klp-dev
...
* commit 'c59c6dd66b8ec5537c82e330d1c96e9fa424b4fa':
For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA default to PHONE_TYPE_GSM
2013-09-08 18:34:09 -07:00
Wink Saville
bdd61696c6
Merge "Tighten test for warm sim and add more debug." into klp-dev
2013-09-09 01:32:45 +00:00
Wink Saville
c59c6dd66b
Merge "For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA default to PHONE_TYPE_GSM" into klp-dev
2013-09-09 01:32:01 +00:00
Christopher Tate
6b86ac7046
am ffe0a803: Fix permission checks around setBackupEnabled()
...
* commit 'ffe0a803f8e9546a0dbf6c82d6089ac0eee32ddb':
Fix permission checks around setBackupEnabled()
2013-09-08 17:54:40 -07:00
Christopher Tate
ffe0a803f8
Fix permission checks around setBackupEnabled()
...
...by making sure to drop binder identity before writing our new
state to secure settings etc.
Bug 10506933
Change-Id: I00505cc5215c8fe5f30f2f35698b30645fe14c87
2013-09-08 15:41:32 -07:00
Dianne Hackborn
d4ff4b649e
am e6a01f37: Merge "Fix build." into klp-dev
...
* commit 'e6a01f37934340c9fce9dcd8ee98b02d9d635af6':
Fix build.
2013-09-08 13:14:56 -07:00
Dianne Hackborn
e6a01f3793
Merge "Fix build." into klp-dev
2013-09-08 20:13:13 +00:00
Christopher Tate
bb59519024
am 89c5a118: Merge "Don\'t crash attempting restore of uninstalled live wallpaper" into klp-dev
...
* commit '89c5a1180830934db485ff9c189143deab653310':
Don't crash attempting restore of uninstalled live wallpaper
2013-09-08 13:08:24 -07:00
Dianne Hackborn
01f8c0e277
Fix build.
...
Change-Id: Ifeac5d09a654ee1183ae26519c8b44f560afd636
2013-09-08 13:07:32 -07:00
Christopher Tate
89c5a11808
Merge "Don't crash attempting restore of uninstalled live wallpaper" into klp-dev
2013-09-08 20:07:20 +00:00
Christopher Tate
909522048f
Don't crash attempting restore of uninstalled live wallpaper
...
Bug 10658041
Change-Id: I08b38cc81fbb89907a4ffe5b6f94e9a507226011
2013-09-08 13:01:28 -07:00
Dianne Hackborn
ab98aec612
am 4b989781: Merge "Work on issue #10130785 : Restore silence and vibrate settings..." into klp-dev
...
* commit '4b98978157295c6e7ea21b70ffcf9edffc41f0e1':
Work on issue #10130785 : Restore silence and vibrate settings...
2013-09-08 12:33:48 -07:00
Dianne Hackborn
4b98978157
Merge "Work on issue #10130785 : Restore silence and vibrate settings..." into klp-dev
2013-09-08 19:31:06 +00:00
John Spurlock
74ac2ecb44
Restore alpha animation to status bar rhs icons.
...
Avoid the view group to prevent stomping on an existing animation.
Bug:10653941
Change-Id: I3d2bdd6360699d3d70c158ec1b8f832bd7205147
2013-09-08 11:00:06 -04:00
John Spurlock
fceb7eddde
Draw status bar battery icon bolt in code.
...
Use high-res polygon points, punching a hole in the rest of drawing
with PorterDuff.Mode.CLEAR.
Remove the now obsolete lightning.png and associated color filters.
Bug:10640891
Change-Id: I8f2d4dd157f9866f37ed9b3480bb79ee9f109975
2013-09-08 10:29:11 -04:00
Svetoslav Ganov
d0ff896789
am d8adcd21: am c7222124: Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev
...
* commit 'd8adcd219dab97682a808b1ba12cd6528e33505e':
Printers for a disappearing print serivce incorrectly removed.
2013-09-07 15:09:24 -07:00
Svetoslav Ganov
d8adcd219d
am c7222124: Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev
...
* commit 'c72221242e560b4176e6fb9e3eec1c32cc1b96c3':
Printers for a disappearing print serivce incorrectly removed.
2013-09-07 15:07:09 -07:00
Svetoslav Ganov
c72221242e
Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev
2013-09-07 22:05:14 +00:00