Fabrice Di Meglio
4287bb6040
am 8af2a13d: Merge "Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams" into jb-mr1-dev
...
* commit '8af2a13d038002522c2f4e5d65bd703db9f86a08':
Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams
2012-09-28 12:36:18 -07:00
Svetoslav Ganov
47c52a873e
Merge "Some accessibility events not sent from touch explorer if apps misbehave." into jb-mr1-dev
2012-09-28 12:35:58 -07:00
Fabrice Di Meglio
778aea3926
am 669aa7cb: Merge "Other improvements for bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
...
* commit '669aa7cb35e0d32fbf6f26a44e5ab8f6fae37de9':
Other improvements for bug #6427629 Clean up layout direction APIs
2012-09-28 12:34:33 -07:00
Fabrice Di Meglio
8af2a13d03
Merge "Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams" into jb-mr1-dev
2012-09-28 12:33:49 -07:00
Daniel Sandler
f59a90c247
Fix occasional re-posting of ticker text.
...
Bug: 6992707
Change-Id: Ib289d742c2fb24d2c201d597349fa86ad8ce4a28
2012-09-28 15:33:14 -04:00
Fabrice Di Meglio
669aa7cb35
Merge "Other improvements for bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
2012-09-28 12:31:46 -07:00
Daniel Sandler
3a8b38d09f
am 287f8a6e: Merge "Remove dock home support." into jb-mr1-dev
...
* commit '287f8a6e111e3f46d5ecb5622df5a3ab02f4276c':
Remove dock home support.
2012-09-28 12:27:54 -07:00
Daniel Sandler
287f8a6e11
Merge "Remove dock home support." into jb-mr1-dev
2012-09-28 12:25:31 -07:00
Adam Powell
493e037ce3
am 808ce66a: Merge "ScaleGestureDetector does the safety dance." into jb-mr1-dev
...
* commit '808ce66a08bbd2604d71f3368788ba7496f71482':
ScaleGestureDetector does the safety dance.
2012-09-28 12:24:08 -07:00
Winson Chung
2d99cd47e1
am cfb7d392: Merge "Adding missing file in previous change (Bug 7252771)" into jb-mr1-dev
...
* commit 'cfb7d392ef9d4cf0ed7d846da93225f0512e882b':
Adding missing file in previous change (Bug 7252771)
2012-09-28 12:22:19 -07:00
Adam Powell
4adcf4d348
am f7910e31: Merge "Add wireless display selection support to MediaRouter." into jb-mr1-dev
...
* commit 'f7910e3148cd5ea21c9c3cdb7023c997139264ce':
Add wireless display selection support to MediaRouter.
2012-09-28 12:22:16 -07:00
Daniel Sandler
7c135205f2
Remove dock home support.
...
We still have dock apps and dock mode, just not home-key
capture.
Bug: 7163049
Change-Id: I8234ebf066798071517b4a586b06708b6ec0bc71
2012-09-28 15:21:45 -04:00
Adam Powell
808ce66a08
Merge "ScaleGestureDetector does the safety dance." into jb-mr1-dev
2012-09-28 12:21:28 -07:00
Winson Chung
cfb7d392ef
Merge "Adding missing file in previous change (Bug 7252771)" into jb-mr1-dev
2012-09-28 12:19:04 -07:00
Adam Powell
f7910e3148
Merge "Add wireless display selection support to MediaRouter." into jb-mr1-dev
2012-09-28 12:19:04 -07:00
Scott Main
1134de0f12
add api level 17 to javadoc filter and update version number
...
Change-Id: I278f796b3390e57f4309f215e4f37359a80f0e83
2012-09-28 12:12:59 -07:00
Craig Mautner
511aafdcf7
am 6e2cbccc: Merge "Missed a spot, needInput was not getting called." into jb-mr1-dev
...
* commit '6e2cbccc46e7dbdcfe6911863fd74a8e50c8f9f8':
Missed a spot, needInput was not getting called.
2012-09-28 12:09:54 -07:00
Craig Mautner
6e2cbccc46
Merge "Missed a spot, needInput was not getting called." into jb-mr1-dev
2012-09-28 12:07:17 -07:00
Adam Powell
f3a2bf8edd
ScaleGestureDetector does the safety dance.
...
Warn in the event of possibly bogus event streams and don't try to
clear empty history.
Bug 7241640
Bug 7243006
Change-Id: I037cf1334cab790ef5998ca5f8f6b323ed5f4459
2012-09-28 12:05:10 -07:00
Christopher Tate
4873a480f6
DO NOT MERGE - Full (local) restore security changes
...
(1) Prevent full restore from creating files/directories that are
accessible by other applications
(2) Don't restore filesets from "system" packages; i.e. any that runs
as a special uid, unless they define their own agent for handling
the restore process.
Bug 7168284
This is a cherry-pick from the originating tree.
Change-Id: I9f39ada3c4c3b7ee63330b015e62745e84ccb58f
2012-09-28 12:00:38 -07:00
Winson Chung
1d74a5a46d
Adding missing file in previous change (Bug 7252771)
...
Change-Id: I5f37a45b7c07d56cad850d90232f39a027e65ba7
2012-09-28 11:56:46 -07:00
Craig Mautner
cd03a26f4f
Missed a spot, needInput was not getting called.
...
Fixes bug 7250008.
Change-Id: I837af438510275ea69e217289aeb7a08111b91b5
2012-09-28 11:54:09 -07:00
Winson Chung
1afb80658a
am 9fc6b8c5: Fixing crash in QuickContacts. (Bug 7252771)
...
* commit '9fc6b8c5b78556d571bfaa9aa0a6a5cc499b2a01':
Fixing crash in QuickContacts. (Bug 7252771)
2012-09-28 11:49:20 -07:00
Adam Powell
705ab808cf
Add wireless display selection support to MediaRouter.
...
* Adds the new route type LIVE_VIDEO
* Wireless displays support both LIVE_VIDEO and LIVE_AUDIO, making
wireless display routes valid selections in when apps make selecting
live audio routes available.
* MediaRouter will only report/manipulate wireless displays that have
already been paired at the system level.
Bug 7177920
Change-Id: Ic221b8687d77b4c0df9801c396b74870e86206e9
2012-09-28 11:46:40 -07:00
Winson Chung
9fc6b8c5b7
Fixing crash in QuickContacts. (Bug 7252771)
...
Change-Id: Ibf304a4c2115f557e0408e345c7714d248fcd35d
2012-09-28 11:37:46 -07:00
Christopher Tate
a1257c4cde
am 8c832e9f: (-s ours) am ad8bda21: (-s ours) am 64d1f3ef: DO NOT MERGE - Full (local) restore security changes
...
* commit '8c832e9f766edfc6130c3eea30e1869e2db8de26':
DO NOT MERGE - Full (local) restore security changes
2012-09-28 11:35:53 -07:00
Christopher Tate
8c832e9f76
am ad8bda21: (-s ours) am 64d1f3ef: DO NOT MERGE - Full (local) restore security changes
...
* commit 'ad8bda219e9d9b18144ace7853997c536bb2f1fc':
DO NOT MERGE - Full (local) restore security changes
2012-09-28 11:33:54 -07:00
Christopher Tate
ad8bda219e
am 64d1f3ef: DO NOT MERGE - Full (local) restore security changes
...
* commit '64d1f3efd759b70462aecb6cf1d8c733872a8911':
DO NOT MERGE - Full (local) restore security changes
2012-09-28 11:32:15 -07:00
Svetoslav Ganov
fe304b8939
Some accessibility events not sent from touch explorer if apps misbehave.
...
1. The touch explorer is relying on the hover exit accessibility event to be sent
from the app's view tree before sending the exploration end and last touch
accessibility events. However, if the app is buggy and does not send the hover
exit event, then the interaction ending events are never sent. Now there is a
timeout in which we wait for the hover exit accessibility event before sending
the gesture end and last touch accessibility events. Hence, we are making a
best effort to have a consistent event stream.
2. Sneaking in the new nine patch for the border around the magnified region
since the current one is engineering art.
bug:7233616
Change-Id: Ie64f23659c25ab914565d50537b9a82bdc6a44a0
2012-09-28 11:23:24 -07:00
Raph Levien
25cd09344f
am 54801e12: Merge "Fix for bug 6936752 Tamil text gets truncated on right-hand side" into jb-mr1-dev
...
* commit '54801e120a2275037e37f065926b81d9f6e4b3d5':
Fix for bug 6936752 Tamil text gets truncated on right-hand side
2012-09-28 11:17:34 -07:00
Raph Levien
54801e120a
Merge "Fix for bug 6936752 Tamil text gets truncated on right-hand side" into jb-mr1-dev
2012-09-28 11:14:48 -07:00
Amith Yamasani
2d79ad23dc
am 01996793: Merge "Remove user switcher from long-press power menu" into jb-mr1-dev
...
* commit '01996793dd2a70acb0ae006960c23c31f0e39d5f':
Remove user switcher from long-press power menu
2012-09-28 11:12:13 -07:00
Amith Yamasani
01996793dd
Merge "Remove user switcher from long-press power menu" into jb-mr1-dev
2012-09-28 11:09:22 -07:00
Baligh Uddin
56f2e63217
Import translations. DO NOT MERGE
...
Change-Id: I621c7a7eeefbe29fe52656a8716c1a2efea71e73
Auto-generated-cl: translation import
2012-09-28 11:07:50 -07:00
Baligh Uddin
1a702680b1
Import translations. DO NOT MERGE
...
Change-Id: Ieca5b943743270ea1eb150588d9055bb272f4f2a
Auto-generated-cl: translation import
2012-09-28 11:06:59 -07:00
Baligh Uddin
33c2134811
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-09-28 11:01:44 -07:00
Ben Gruver
110bd9d663
am 9dbbfcda: Merge "Pass the originating uid to the package verifier" into jb-mr1-dev
...
* commit '9dbbfcda81f251f23aded866f7f9d49d8a744c75':
Pass the originating uid to the package verifier
2012-09-28 11:01:10 -07:00
Ben Gruver
9dbbfcda81
Merge "Pass the originating uid to the package verifier" into jb-mr1-dev
2012-09-28 10:58:19 -07:00
Jatin Lodhia
856b01e7e4
Make the theme for choose account and choose account type dialogs same.
...
Contacts app uses a custom account picker which calls the system account picker
when an account needs to be added. The system accout picker invokes choose
accout type dialog which overlays over the system acccount picker. Because these
two dialog boxes use different themes, he one behind is wider than the one in
foreground and ends up looking like a thin black strip protruding from the two
sides.
Bug: 6980517
Change-Id: Ia8b23767d995dcbe1a58087cb4bfbee140c2c744
2012-09-28 10:53:37 -07:00
Daniel Sandler
f3693436ff
am f80ad90f: Merge "Add the SystemUI\'s dream-starter as a DESK_DOCK app." into jb-mr1-dev
...
* commit 'f80ad90f0b269e31d9450b9fa33f4dc3e4a507c7':
Add the SystemUI's dream-starter as a DESK_DOCK app.
2012-09-28 10:53:31 -07:00
Baligh Uddin
edf60a29cd
Import translations. DO NOT MERGE
...
Change-Id: I7cff2dd7d10ebd07608f24d499f867e4b21a3a9d
Auto-generated-cl: translation import
2012-09-28 10:52:06 -07:00
Baligh Uddin
c690f6fb9b
Import translations. DO NOT MERGE
...
Change-Id: I343267135e3eb0f2bb145c514a05f666e2c17ecb
Auto-generated-cl: translation import
2012-09-28 10:50:33 -07:00
Daniel Sandler
a32c25607d
am 6e061919: Merge "Prop the tablet notification panel open a bit." into jb-mr1-dev
...
* commit '6e061919f313f787c91047bebdfb95fdb756d6bb':
Prop the tablet notification panel open a bit.
2012-09-28 10:49:45 -07:00
Daniel Sandler
f80ad90f0b
Merge "Add the SystemUI's dream-starter as a DESK_DOCK app." into jb-mr1-dev
2012-09-28 10:49:19 -07:00
Daniel Sandler
6e061919f3
Merge "Prop the tablet notification panel open a bit." into jb-mr1-dev
2012-09-28 10:47:45 -07:00
Svetoslav Ganov
4dce1666d2
am 95841ac3: Merge "Inconsistent events on transition from gesture detection to touch exploration." into jb-mr1-dev
...
* commit '95841ac3c2d45a839cc3cd0bd420fd9d91ccd583':
Inconsistent events on transition from gesture detection to touch exploration.
2012-09-28 10:42:26 -07:00
Svetoslav Ganov
a3799068c8
am ca868820: Merge "Accessibility services that do not accept events are mismanaged." into jb-mr1-dev
...
* commit 'ca8688207b68612419213cc8f3afd7abeb03a181':
Accessibility services that do not accept events are mismanaged.
2012-09-28 10:39:43 -07:00
Svetoslav Ganov
95841ac3c2
Merge "Inconsistent events on transition from gesture detection to touch exploration." into jb-mr1-dev
2012-09-28 10:39:38 -07:00
Svetoslav Ganov
ca8688207b
Merge "Accessibility services that do not accept events are mismanaged." into jb-mr1-dev
2012-09-28 10:36:53 -07:00
Craig Mautner
9b80287dd8
am af08ccb2: Merge "Add null checks before using mViewMediatorCallback." into jb-mr1-dev
...
* commit 'af08ccb20dbfc19c668c6566ca17f2464ad12696':
Add null checks before using mViewMediatorCallback.
2012-09-28 10:35:29 -07:00