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
f5cbed0177
am 0a52088e: Merge "Fix typo." into jb-mr1-dev
...
* commit '0a52088e58a6ddea0966ba9cd2fbc7bd3e23809a':
Fix typo.
2012-09-25 17:04:02 -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
Jeff Brown
0a52088e58
Merge "Fix typo." into jb-mr1-dev
2012-09-25 17:02:06 -07:00
Winson Chung
50c44fdb3c
am 282c51d3: Merge "Updating time/alarm tiles, fixing issue with empty space under QuickSettings (Bug 7205141, Bug 7222371)" into jb-mr1-dev
...
* commit '282c51d3912995308901b45d22d1801eec50df41':
Updating time/alarm tiles, fixing issue with empty space under QuickSettings (Bug 7205141, Bug 7222371)
2012-09-25 16:53:46 -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
Winson Chung
282c51d391
Merge "Updating time/alarm tiles, fixing issue with empty space under QuickSettings (Bug 7205141, Bug 7222371)" into jb-mr1-dev
2012-09-25 16:51:11 -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
Jason Sams
bbe1685341
am 0c622570: Merge "Reduce test warmup time to avoid driving into thermal throttle." into jb-mr1-dev
...
* commit '0c622570799977a5efab2357b134e38c21ce009b':
Reduce test warmup time to avoid driving into thermal throttle.
2012-09-25 16:46:16 -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
Winson Chung
c86b23b9a6
Updating time/alarm tiles, fixing issue with empty space under QuickSettings (Bug 7205141, Bug 7222371)
...
Change-Id: If42308a0bbc4a31ffb7f5f0b66063c3b1418ca3e
2012-09-25 16:44:29 -07:00
Jason Sams
0c62257079
Merge "Reduce test warmup time to avoid driving into thermal throttle." into jb-mr1-dev
2012-09-25 16:42:10 -07:00
Romain Guy
38b81c7ff0
am 5d50ab7c: Merge "Deleting objects on the wrong thread is a silly idea Bug #7195815 " into jb-mr1-dev
...
* commit '5d50ab7cbaa4fe63783730974de69c07ef7e85d5':
Deleting objects on the wrong thread is a silly idea Bug #7195815
2012-09-25 16:36:17 -07:00
Romain Guy
5d50ab7cba
Merge "Deleting objects on the wrong thread is a silly idea Bug #7195815 " into jb-mr1-dev
2012-09-25 16:34:04 -07:00
Elliott Hughes
3ba8e14bb0
am bf5d1858: Merge "Attempt to clarify how pluralization actually works." into jb-mr1-dev
...
* commit 'bf5d1858006f38fd15b2aaa6ec74636e53e5323e':
Attempt to clarify how pluralization actually works.
2012-09-25 16:30:06 -07:00
Michael Jurka
c543b6720a
am 99f19db6: Merge "Fix 7216326: Recents has a "dead zone" on tablets" into jb-mr1-dev
...
* commit '99f19db697e02caaf8bbbe4284244027dae000b5':
Fix 7216326: Recents has a "dead zone" on tablets
2012-09-25 16:30:02 -07:00
Michael Jurka
828660a300
am 150443a9: Merge "Fix 7216870: recents relaunches dismissed activity" into jb-mr1-dev
...
* commit '150443a99f87e02f7a0ec6af622e741814fa0190':
Fix 7216870: recents relaunches dismissed activity
2012-09-25 16:29:58 -07:00
Elliott Hughes
bf5d185800
Merge "Attempt to clarify how pluralization actually works." into jb-mr1-dev
2012-09-25 16:25:29 -07:00
Michael Jurka
99f19db697
Merge "Fix 7216326: Recents has a "dead zone" on tablets" into jb-mr1-dev
2012-09-25 16:22:31 -07:00
Michael Jurka
76218b8a16
Fix 7216326: Recents has a "dead zone" on tablets
2012-09-25 16:17:12 -07:00
Elliott Hughes
0cd016741d
Attempt to clarify how pluralization actually works.
...
Many languages are very unlike English.
Bug: 7229680
Change-Id: I3a2b9d10ee7d92b0a0bc47d81bd372fd8ce6ba19
2012-09-25 16:15:35 -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
Michael Jurka
150443a99f
Merge "Fix 7216870: recents relaunches dismissed activity" into jb-mr1-dev
2012-09-25 16:04:53 -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
Irfan Sheriff
2e1a8197d1
am e79275a9: Merge "P2p fixes" into jb-mr1-dev
...
* commit 'e79275a9f6d5215fd9b833f8921939c0993389f2':
P2p fixes
2012-09-25 15:57:20 -07:00
Irfan Sheriff
e79275a9f6
Merge "P2p fixes" into jb-mr1-dev
2012-09-25 15:54:47 -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
Romain Guy
8a1374946a
Deleting objects on the wrong thread is a silly idea
...
Bug #7195815
Turns out that multi-threading is hard.
Change-Id: Ib0b4bd6dc3caea27f7ced22cbb363bb955fe58ab
2012-09-25 15:49:03 -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
Svetoslav Ganov
1908cf9ec4
Merge "Fixing argument expectations of View.requestRectangleOnScreen" into jb-mr1-dev
2012-09-25 15:45:35 -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
Jeff Brown
28e0b09a3d
Fix typo.
...
Bug: 7183618
Change-Id: I0c761fc7f55b3f182007cb4d50cbfdce309f844a
2012-09-25 15:15:17 -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
Jason Sams
761d3d0df7
Reduce test warmup time to avoid driving into thermal throttle.
...
bug 7216044
Change-Id: I72c83e31dc39a0a810d8a453903213bd428dbe29
2012-09-25 15:00:04 -07:00
Baligh Uddin
0506c7b6ef
am b1c4ab5c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'b1c4ab5c2afea1f0797ee397df6512366128d980':
Import translations. DO NOT MERGE
2012-09-25 14:56:51 -07:00
Baligh Uddin
b1c4ab5c2a
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-25 14:53:43 -07:00
Baligh Uddin
4f38ceeda1
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-09-25 14:51:16 -07:00
Svetoslav Ganov
4a847601c2
am 1c9766e3: Merge "The active window for accessibilitiy incorrectly tracked." into jb-mr1-dev
...
* commit '1c9766e32a630c72db400a769430e60549062577':
The active window for accessibilitiy incorrectly tracked.
2012-09-25 14:49:50 -07:00
Svetoslav Ganov
1c9766e32a
Merge "The active window for accessibilitiy incorrectly tracked." into jb-mr1-dev
2012-09-25 14:46:58 -07:00
Irfan Sheriff
c41096e1b4
P2p fixes
...
- Add wfdInfo details in group to allow display stack to filter
- Handle provision discovery failure and reset
- Do a discovery after group removal
- Handle failure to reinvoke and fall back to negotiation
- Avoid multiple REMOVE_GROUP calls that lead to removal
of persisted network
Bug: 7210856
Change-Id: Ia2e613e9b1191b919a185f0411439341e2e151bc
2012-09-25 14:44:00 -07:00
Baligh Uddin
dc5da4e712
am 1a2297a8: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '1a2297a89dc08594f73fd1748dc8ee941be93dc6':
Import translations. DO NOT MERGE
2012-09-25 14:43:36 -07:00