Jeff Brown
3476cb8ec2
am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev
...
* commit 'b32e221699201cb647beae3fe0a1771fd5a41cf4':
Update references to migrated global settings.
Handle user switched for settings changes.
2012-09-25 17:05:56 -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
894aedafea
am 61ad1bac: Merge "Fix AbsListView to correctly retain its state if not layed out." into jb-mr1-dev
...
* commit '61ad1bacf8985e088c039d90123bf0d2a5de94fe':
Fix AbsListView to correctly retain its state if not layed out.
2012-09-25 16:52:02 -07:00
Svetoslav Ganov
53da9d3490
am c91fb587: Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev
...
* commit 'c91fb5875bfd7f91d50d6fe939873872b53c8b2f':
Adding a global accessibility action to open quick settings.
2012-09-25 16:49:56 -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
Brian Carlstrom
71d2b48fb7
am fe54290d: Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev
...
* commit 'fe54290df0c5d495b7f388035a4ae3a20821a183':
Add a static generator that takes a Socket Write Timeout Argumanet
2012-09-25 16:48:02 -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
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
735f9c94ad
am e8e98704: Merge "Fix bug #7158772 ProgressBar / SeekBar / RatingBar drawables should be reversed when in RTL mode" into jb-mr1-dev
...
* commit 'e8e98704f3ac7b7d4070d4faabc56312efaea9bd':
Fix bug #7158772 ProgressBar / SeekBar / RatingBar drawables should be reversed when in RTL mode
2012-09-25 16:01:13 -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
0b6a060400
am be47828f: Merge "Load resources for the correct user" into jb-mr1-dev
...
* commit 'be47828fbce3c647211b6948df4b61a27275cdff':
Load resources for the correct user
2012-09-25 15:51:35 -07:00
Amith Yamasani
be47828fbc
Merge "Load resources for the correct user" into jb-mr1-dev
2012-09-25 15:49:39 -07:00
Svetoslav Ganov
8f85d62b95
am 1908cf9e: Merge "Fixing argument expectations of View.requestRectangleOnScreen" into jb-mr1-dev
...
* commit '1908cf9ec4cd9691f2e3228c4de74d11dab9073d':
Fixing argument expectations of View.requestRectangleOnScreen
2012-09-25 15:48:16 -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
5efef2a282
am 64339168: Merge "Don\'t destroy the same texture twice Bug #7221449 " into jb-mr1-dev
...
* commit '64339168c4ff0b3ac249398811db7c88eca8f95c':
Don't destroy the same texture twice Bug #7221449
2012-09-25 12:50:37 -07:00
Brian Carlstrom
ce536f3b47
am 5e21bf93: Unhide SSLCertificateSocketFactory.setSoWriteTimeout
...
* commit '5e21bf934b2a71b595deb9856a2044eea4dbce86':
Unhide SSLCertificateSocketFactory.setSoWriteTimeout
2012-09-25 12:50:11 -07:00
Eric Laurent
5fc4e44351
am 4bbcc654: Display a fixed volume silder when docked.
...
* commit '4bbcc6549738f3d69831b2bd9eb4accec3e9920e':
Display a fixed volume silder when docked.
2012-09-25 12:49:03 -07:00
Jean-Baptiste Queru
6d5efebc56
am 5ef9cb68: Merge into jb-mr1-dev
...
* commit '5ef9cb68c3bb639990abc0eadcaaaa61164ad628':
Hiding a method for JB-MR1
2012-09-25 12:48:55 -07:00
Romain Guy
0708f52740
am ed1b6f4f: Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
...
* commit 'ed1b6f4fc0af836624b2edc2830eb918bf04cf3c':
Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
2012-09-25 12:48:40 -07:00
Romain Guy
6f62e86dd8
am c002936e: Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
...
* commit 'c002936e4bd042db3024202b3e9696835a730cfa':
Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
2012-09-25 12:48:33 -07:00
Jean-Baptiste Queru
74b11cbff0
am 7951c459: Merge into jb-mr1-dev
...
* commit '7951c459aefeb012638477b762e19b792ecbe009':
AppInfo from Notifications for secondary users
2012-09-25 12:47:49 -07:00
Jean-Baptiste Queru
b7e4bbbed6
am a5e1d21f: Merge into jb-mr1-dev
...
* commit 'a5e1d21f566c8df750d766c76f6a99432a703c5e':
Move multi-user OBB under user-specific path.
2012-09-25 12:47:37 -07:00
Jean-Baptiste Queru
507cb6e231
am ec199613: Merge into jb-mr1-dev
...
* commit 'ec1996131d2e17408a22fd55fbc3edba5ea80d02':
Fix surface view on secondary display.
Fix drag and drop surfaces on secondary displays.
Allow a window on a secondary display to have focus.
2012-09-25 12:47:27 -07:00
Jean-Baptiste Queru
185c3a700d
am 7a7c6aa0: Merge into jb-mr1-dev
...
* commit '7a7c6aa0c35d80145e163d9e637180d3be127441':
Force activities to run on the second display for testing.
2012-09-25 12:47:17 -07:00
Martijn Coenen
87f22278c3
am f8538594: Fix build.
...
* commit 'f8538594fe6ba6db3310da042597840601d78cda':
Fix build.
2012-09-25 12:47:00 -07:00
Jean-Baptiste Queru
3d9e6909fd
am 1b242759: Merge into jb-mr1-dev
...
* commit '1b242759763205fa529591738cbe213fcc25150e':
Adding support for new 'uid2445' column in Calendar's Events table.
2012-09-25 12:46:53 -07:00
Jean-Baptiste Queru
5170ae12c3
am 0de06b7e: Merge into jb-mr1-dev
...
* commit '0de06b7e19e4c6329cc966198d249d12c2b19d40':
TaskStackBuilder and intents without an explicit target
2012-09-25 12:46:46 -07:00
Jean-Baptiste Queru
908fae38fe
am c68accd3: Merge into jb-mr1-dev
...
* commit 'c68accd35e9ee0a49172ef144664f0fe9187ccd7':
Add extra error check when eglCreateContext fails Bug #7216919
2012-09-25 12:46:43 -07:00
Jean-Baptiste Queru
89ee9b26ab
am 93fd0f7a: Merge into jb-mr1-dev
...
* commit '93fd0f7a83f61d4d673b73e002bd9ad7d6ce562b':
Camera: Improve enableShutterSound documentation.
2012-09-25 12:46:35 -07:00
Jean-Baptiste Queru
df3131e466
am 6fb2514c: Merge into jb-mr1-dev
...
* commit '6fb2514cdf77e2657d7b73b0cd97e060aefc6b53':
Fix issue #7215984 : java.lang.RuntimeException: Unable to create...
2012-09-25 12:46:26 -07:00
Martijn Coenen
8aad9d7923
am 8f862ef9: Add NfcBarcode technology API.
...
* commit '8f862ef9f74f2d2ebf767c645ce39db8412dd08f':
Add NfcBarcode technology API.
2012-09-25 12:46:22 -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