Adam Powell
823de2070f
am b7066338: am b4693e25: Merge "Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector." into jb-mr1-dev
...
* commit 'b706633863ba616133c0976078885b7c81d4591e':
Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector.
2012-09-25 17:21:19 -07:00
Adam Powell
b4693e25b1
Merge "Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector." into jb-mr1-dev
2012-09-25 17:17:22 -07:00
Jeff Brown
9da4d74477
am 876f95ed: am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev
...
* commit '876f95ed7f914b4d86634db552277f835d288805':
Update references to migrated global settings.
Handle user switched for settings changes.
2012-09-25 17:11:25 -07:00
Jeff Brown
b32e221699
Merge changes I332f020f,I632648ac into jb-mr1-dev
...
* changes:
Update references to migrated global settings.
Handle user switched for settings changes.
2012-09-25 17:03:11 -07:00
Dianne Hackborn
a2636fc003
am 923e3cc1: am 61ad1bac: Merge "Fix AbsListView to correctly retain its state if not layed out." into jb-mr1-dev
...
* commit '923e3cc1aa59e0713fc7ecfac8f8ab2953c02cfc':
Fix AbsListView to correctly retain its state if not layed out.
2012-09-25 16:54:31 -07:00
Svetoslav Ganov
2a0168615b
am dfd00788: am c91fb587: Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev
...
* commit 'dfd007884d104417b8d39fd2002f09b11ac875f8':
Adding a global accessibility action to open quick settings.
2012-09-25 16:52:34 -07:00
Brian Carlstrom
1802935852
am bee07548: am fe54290d: Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev
...
* commit 'bee07548d5beda94538a211383847889dc9224b5':
Add a static generator that takes a Socket Write Timeout Argumanet
2012-09-25 16:50:47 -07:00
Dianne Hackborn
61ad1bacf8
Merge "Fix AbsListView to correctly retain its state if not layed out." into jb-mr1-dev
2012-09-25 16:49:05 -07:00
Svetoslav Ganov
c91fb5875b
Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev
2012-09-25 16:47:06 -07:00
Brian Carlstrom
fe54290df0
Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev
2012-09-25 16:46:09 -07:00
Fabrice Di Meglio
2874ace197
am ef866005: am e8e98704: Merge "Fix bug #7158772 ProgressBar / SeekBar / RatingBar drawables should be reversed when in RTL mode" into jb-mr1-dev
...
* commit 'ef8660057e7cfbc7f03618fb12ca7e0eb9278ce8':
Fix bug #7158772 ProgressBar / SeekBar / RatingBar drawables should be reversed when in RTL mode
2012-09-25 16:31:39 -07:00
Adam Powell
a4ce6ae0d3
Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector.
...
Bug 7199099
Change-Id: I7268268237cc690c2ff952d4b2cd2ddc6dce2ca5
2012-09-25 16:21:53 -07:00
Svetoslav Ganov
e20a177d3f
Adding a global accessibility action to open quick settings.
...
1. Added APIs for opening the quick settings to the StatusBarManagerService
and the local StatausBarManager. The new APIs are protected by the old
EXPAND_STATUS_BAR permission.
Renamed the expand* and collapse* non-public APIs that are expanding
the notifications to expandNotifications* collapseNotifications* to
better convey what they do given that this change adds
expandQuickSettings* and collapseQuickSettings*.
Added a global action to the accessibility layer to expand the quick
settings which is calling into the new status bar manager APIs.
bug:7030487
Change-Id: Ic7b46e1a132f1c0d71355f18e7c5a9a2424171c3
2012-09-25 16:07:59 -07:00
Fabrice Di Meglio
e8e98704f3
Merge "Fix bug #7158772 ProgressBar / SeekBar / RatingBar drawables should be reversed when in RTL mode" into jb-mr1-dev
2012-09-25 15:58:56 -07:00
Amith Yamasani
7585c8f39d
am c33ad3be: am be47828f: Merge "Load resources for the correct user" into jb-mr1-dev
...
* commit 'c33ad3bec8c9670a2671b6217bdfc2b7bbe6e437':
Load resources for the correct user
2012-09-25 15:53:43 -07:00
Svetoslav Ganov
b2caa627be
am a5d09204: am 1908cf9e: Merge "Fixing argument expectations of View.requestRectangleOnScreen" into jb-mr1-dev
...
* commit 'a5d09204ff87539147163807428265ce857ee618':
Fixing argument expectations of View.requestRectangleOnScreen
2012-09-25 15:50:31 -07:00
Amith Yamasani
be47828fbc
Merge "Load resources for the correct user" into jb-mr1-dev
2012-09-25 15:49:39 -07:00
Amith Yamasani
98edc95171
Load resources for the correct user
...
For apps that are only installed on secondary users, the SystemUI is
unable to see them by default. Added some methods to explicitly pass the
userId of the user the resources are requested for by the StatusBarIcon
Bug: 7214384
Also fix binding to remote views
Bug: 7192802
Change-Id: I5d6c5f624aa37fb231f3467f9764c8d99077a91d
2012-09-25 15:45:27 -07:00
Alon Albert
fd901f735c
Add a static generator that takes a Socket Write Timeout Argumanet
...
Use it from AndroidHttpClient
Bug: 6693087
Change-Id: I08648e441a6431d0944caaec0db516a26671f2a5
2012-09-25 15:33:28 -07:00
Jeff Brown
bf6f6f9de7
Update references to migrated global settings.
...
Fixed one setting that was migrated but not marked deprecated.
Removed a hidden setting that is no longer used by the new
power manager service.
Bug: 7231172
Change-Id: I332f020f876a18d519a1a20598a172f1c98036f7
2012-09-25 15:27:51 -07:00
Jeff Brown
d49359631b
Handle user switched for settings changes.
...
Move OVERLAY_DISPLAY_DEVICES to Global.
Bug: 7127417
Change-Id: I632648ac5b01408512f59424f3bb55162431bea4
2012-09-25 15:26:51 -07:00
Svetoslav Ganov
989ae759f8
Fixing argument expectations of View.requestRectangleOnScreen
...
1. In a previous patch the implementation of the method was fixed
in terms of end result but this broke some assumptions about the
method arguments. This change updates the argument expectations.
bug:7172035
Change-Id: I76d738b1c74dfb1dd45fc667f3217911f1c10a5f
2012-09-25 15:16:54 -07:00
Dianne Hackborn
e181bd9b5e
Fix AbsListView to correctly retain its state if not layed out.
...
This covers a hole where if the list view restores its state and
then is asked to save its state before its layout happens, the
original state is lost. Instead we just store that original state.
Also tweak FragmentManager to make sure an inactive fragment can
not have its state moved up out of CREATED.
Bug #7232088 : ListView saved state being lost in some cases
Change-Id: I5b40f37c259c7bcbe17dd1330016f9531f1b5534
2012-09-25 15:04:06 -07:00
Fabrice Di Meglio
7fb98b3449
Fix bug #7158772 ProgressBar / SeekBar / RatingBar drawables should be reversed when in RTL mode
...
Change-Id: I0a9cfbc6aa6919da3198a20aae6159bd867afe87
2012-09-25 14:42:43 -07:00
Romain Guy
f5481b7332
am 9e309c2f: am 64339168: Merge "Don\'t destroy the same texture twice Bug #7221449 " into jb-mr1-dev
...
* commit '9e309c2f5b747dbbac4ac2c1fe8452c8e22f3132':
Don't destroy the same texture twice Bug #7221449
2012-09-25 13:30:04 -07:00
Brian Carlstrom
a1b0baf1e5
am df44266d: am 5e21bf93: Unhide SSLCertificateSocketFactory.setSoWriteTimeout
...
* commit 'df44266daa8e50e2a0686bf3fc49454518eabb0f':
Unhide SSLCertificateSocketFactory.setSoWriteTimeout
2012-09-25 13:29:44 -07:00
Eric Laurent
2d13830718
am 6d09e321: am 4bbcc654: Display a fixed volume silder when docked.
...
* commit '6d09e32144926222c065a4bfd631f5962eaa3256':
Display a fixed volume silder when docked.
2012-09-25 13:29:37 -07:00
Romain Guy
ef09a210dd
Don't destroy the same texture twice
...
Bug #7221449
SurfaceTexture already deletes the GL texture when detachFromContext
is invoked. The newly introduced refcount would casue the Layer
object to be destroyed later and attempt to delete the GL texture
again. By the time the second cleanup occurs, the texture name
might have been reused by somebody else, resulting in erroneous
behaviors.
Change-Id: I257c589fea64b34c00f46fbfaa7732e6854a5e41
2012-09-25 12:22:21 -07:00
Brian Carlstrom
5e21bf934b
Unhide SSLCertificateSocketFactory.setSoWriteTimeout
...
Bug: 6693087
Change-Id: I585c2a61226da58077fd7cd7826695ce17380248
2012-09-25 10:38:52 -07:00
Eric Laurent
4bbcc65497
Display a fixed volume silder when docked.
...
Align UI indication to volume policy when docked: the music volume
cannot be adjusted when docked or connected to HDMI. Display
a disabled slider at max volume in this case to be consistent.
Bug 4335692.
Change-Id: I6f8db143b0e2ecf54e4bdacd88afdeb661a98a18
2012-09-25 10:28:05 -07:00
Jean-Baptiste Queru
5ef9cb68c3
Merge into jb-mr1-dev
...
Change-Id: I4696f4336d79ca199f2358bfb3ed5fc7e6c51732
2012-09-25 09:46:23 -07:00
Romain Guy
ed1b6f4fc0
Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext
...
Bug #7216919
Change-Id: Ie4a855ee51a0a4fad69bae8f377189d0c653f543
2012-09-25 09:44:35 -07:00
Romain Guy
c002936e4b
Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext
...
Bug #7216919
Change-Id: If2059227d55e8ddb2d2673ee36029c3c92dd9a3d
2012-09-25 09:43:23 -07:00
Jean-Baptiste Queru
7951c459ae
Merge into jb-mr1-dev
...
Change-Id: Ifc2328e30a52c2baebc1322c9b161104dcf21618
2012-09-25 09:36:32 -07:00
Jean-Baptiste Queru
a5e1d21f56
Merge into jb-mr1-dev
...
Change-Id: I22fd779623397332e493f71ac718b972e1e1dad7
2012-09-25 09:35:53 -07:00
Jean-Baptiste Queru
ec1996131d
Merge into jb-mr1-dev
...
Change-Id: I97ff2551b36a1b590f2d314cabfcf198dd10f404
2012-09-25 09:35:19 -07:00
Jean-Baptiste Queru
7a7c6aa0c3
Merge into jb-mr1-dev
...
Change-Id: I821410e9ffcc7148139465c04ef335f0becc18c2
2012-09-25 09:34:45 -07:00
Martijn Coenen
f8538594fe
Fix build.
...
Bug: 7222958
Change-Id: I2f9ff988f09be6cd4be49bfb90750a46e63c2c14
2012-09-25 09:31:50 -07:00
Jean-Baptiste Queru
1b24275976
Merge into jb-mr1-dev
...
Change-Id: Ie68309c7525b59f12b7bd22beb06ab5e5e4f05f5
2012-09-25 09:31:15 -07:00
Jean-Baptiste Queru
0de06b7e19
Merge into jb-mr1-dev
...
Change-Id: I02a0c4a7c8f66c52631f962e097c28f6a41d7a64
2012-09-25 09:29:18 -07:00
Jean-Baptiste Queru
c68accd35e
Merge into jb-mr1-dev
...
Change-Id: Icd17d762c9d8e96ea6b78b18fa8f66471bc694ae
2012-09-25 09:28:32 -07:00
Jean-Baptiste Queru
93fd0f7a83
Merge into jb-mr1-dev
...
Change-Id: I6bfc2726c0c259eeb3caf13e1cee395324cac4c3
2012-09-25 09:27:02 -07:00
Jean-Baptiste Queru
6fb2514cdf
Merge into jb-mr1-dev
...
Change-Id: I1baab28b12364213673ed7992207ad198491f286
2012-09-25 09:25:15 -07:00
Martijn Coenen
8f862ef9f7
Add NfcBarcode technology API.
...
Supporting only Kovio barcode technology for now.
Bug: 7222958
Change-Id: I63976da2db16b0a5d9ec746f1a0e83833e74e5a9
2012-09-25 09:22:16 -07:00
Kristian Monsen
7f37a5028f
am 20d2bcf8: am 7ae8a60f: Merge "Hiding a method for JB-MR1" into jb-mr1-dev
...
* commit '20d2bcf899ece7a39dcf120bd9cfdfb235f6198f':
Hiding a method for JB-MR1
2012-09-25 07:32:36 -07:00
Kristian Monsen
7ae8a60f35
Merge "Hiding a method for JB-MR1" into jb-mr1-dev
2012-09-25 07:29:13 -07:00
Romain Guy
0c3df4308d
am d38bc618: am eea774a1: Merge "Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919 " into jb-mr1-dev
...
* commit 'd38bc618bc0e55e52f0575f51f145dcfec1c983b':
Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
2012-09-24 21:49:42 -07:00
Romain Guy
eea774a1f6
Merge "Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919 " into jb-mr1-dev
2012-09-24 21:45:13 -07:00
Romain Guy
bf3e77d46d
Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext
...
Bug #7216919
Change-Id: Ie4a855ee51a0a4fad69bae8f377189d0c653f543
2012-09-24 21:42:18 -07:00
Philip Milne
8c549d6ffe
Merge "Bug #6110465 . Optical bounds support for all ViewGroup subclasses."
2012-09-24 20:55:00 -07:00