Dianne Hackborn
fe0d0f1d76
am fbbd0072: am 3ff8e1a8: Merge "Fix issue #7211769 and #7244492 , thrash around on #7226656." into jb-mr1-dev
...
* commit 'fbbd0072ebb2cef61cf3b51712181c00b4f5ea54':
Fix issue #7211769 and #7244492 , thrash around on #7226656 .
2012-09-28 16:19:44 -07:00
Robert Greenwalt
a59dc5ad25
am 6fc403a5: am 925a659d: Merge "Use updatable file for premium-sms filter" into jb-mr1-dev
...
* commit '6fc403a511e5c7db4ed3ed7329c85d396d62c5e8':
Use updatable file for premium-sms filter
2012-09-28 15:58:55 -07:00
Dianne Hackborn
3ff8e1a800
Merge "Fix issue #7211769 and #7244492 , thrash around on #7226656." into jb-mr1-dev
2012-09-28 15:54:44 -07:00
Adam Powell
8b397d880f
am 2c8fb236: am 29dcd656: Merge "Track offset of center child view in Gallery for later layouts" into jb-mr1-dev
...
* commit '2c8fb236896ddfa626e14623d0ad55e72c34b79c':
Track offset of center child view in Gallery for later layouts
2012-09-28 15:52:04 -07:00
Svetoslav Ganov
149dc7137e
am 52cf248b: am 07ddb460: Merge "NumberPicker should adjust min and max when displayed values are set." into jb-mr1-dev
...
* commit '52cf248b32b50623b611b86ee41e67d07dc86efa':
NumberPicker should adjust min and max when displayed values are set.
2012-09-28 15:51:51 -07:00
Robert Greenwalt
925a659d82
Merge "Use updatable file for premium-sms filter" into jb-mr1-dev
2012-09-28 15:47:20 -07:00
Dianne Hackborn
d4ac8d7b3d
Fix issue #7211769 and #7244492 , thrash around on #7226656 .
...
Issue #7211769 : Crash dialog from background user has non-working "report"
The report button now launches the issue reporter for the correct user.
Also for crashes on background users, either disable the report button,
or simply don't show the dialog depending on the build config.
Issue #7244492 : Bugreport button in Quick Settings doesn't actually do anything
Now they do.
Issue #7226656 : second user seeing primary user's apps
I haven't had any success at reproducing this. I have tried to tighten up
the path where we create the user to ensure nothing could cause the
user's applications to be accessed before the user it fully created and thus
make them installed... but I can't convince myself that is the actual problem.
Also tightened up the user switch code to use forground broadcasts for all
of the updates about the switch (since this is really a foreground operation),
added a facility to have BOOT_COMPELTED broadcasts not get launched for
secondary users and use that on a few key system receivers, fixed some debug
output.
Change-Id: Iadf8f8e4878a86def2e495e9d0dc40c4fb347021
2012-09-28 15:37:22 -07:00
Adam Powell
29dcd656df
Merge "Track offset of center child view in Gallery for later layouts" into jb-mr1-dev
2012-09-28 14:15:20 -07:00
Svetoslav Ganov
07ddb460af
Merge "NumberPicker should adjust min and max when displayed values are set." into jb-mr1-dev
2012-09-28 14:08:00 -07:00
Adam Powell
4e8510b23f
Track offset of center child view in Gallery for later layouts
...
When apps request layouts while scrolling is in progress, Gallery
children can get offset in strange ways. Compensate for this by
tracking the last known offset and applying it during layout.
Bug 7245853
Change-Id: I9d746ae6bb06918e2d920c58052f72e749a7ffbf
2012-09-28 14:07:35 -07:00
Russell Brenner
491980723a
am dcf2bc55: am fd4da14c: Merge "Add Settings.Secure.USER_SETUP_COMPLETE" into jb-mr1-dev
...
* commit 'dcf2bc553f9f416097077ef4a2541867bba3a844':
Add Settings.Secure.USER_SETUP_COMPLETE
2012-09-28 12:52:54 -07:00
Russell Brenner
fd4da14c83
Merge "Add Settings.Secure.USER_SETUP_COMPLETE" into jb-mr1-dev
2012-09-28 12:47:25 -07:00
Svetoslav Ganov
a1410e6789
NumberPicker should adjust min and max when displayed values are set.
...
1. The BumberPicker exposes APIs for settings displayed values for the
selected numbers. If the min and max value of the picker are less then
the length of the new displayed values array, i.e. they are out of
bounds, the NumberPicker crashes.
bug:7254000
Change-Id: I182e30216ef28c98d6541f9c985b43c8179dec76
2012-09-28 12:40:42 -07:00
Fabrice Di Meglio
3c26928062
am 2f37d37c: am 8af2a13d: Merge "Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams" into jb-mr1-dev
...
* commit '2f37d37c60ab3572b09fc06d2380624456a83666':
Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams
2012-09-28 12:39:05 -07:00
Fabrice Di Meglio
658d260b1a
am b1b6be8b: am 669aa7cb: Merge "Other improvements for bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
...
* commit 'b1b6be8bc36a95eab263c04cc77d3b7d29ca06f4':
Other improvements for bug #6427629 Clean up layout direction APIs
2012-09-28 12:37:19 -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
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
Adam Powell
8a9d3bf4dc
am ce7426db: am 808ce66a: Merge "ScaleGestureDetector does the safety dance." into jb-mr1-dev
...
* commit 'ce7426dbbe0a9cd1a147169d8d7fdcc2b03c719f':
ScaleGestureDetector does the safety dance.
2012-09-28 12:25:56 -07:00
Adam Powell
b2d4daac01
am 9e7bf523: am f7910e31: Merge "Add wireless display selection support to MediaRouter." into jb-mr1-dev
...
* commit '9e7bf523468bc93a98d2117f3dc943f665a5a441':
Add wireless display selection support to MediaRouter.
2012-09-28 12:24:07 -07:00
Adam Powell
808ce66a08
Merge "ScaleGestureDetector does the safety dance." into jb-mr1-dev
2012-09-28 12:21:28 -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
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
Winson Chung
3125f9ee99
am 7c806fde: am 9fc6b8c5: Fixing crash in QuickContacts. (Bug 7252771)
...
* commit '7c806fdea663a6cdf8430a38e5d8b8f024ae8e0a':
Fixing crash in QuickContacts. (Bug 7252771 )
2012-09-28 11:51:04 -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
Ben Gruver
519152d365
am e7b608d7: am 9dbbfcda: Merge "Pass the originating uid to the package verifier" into jb-mr1-dev
...
* commit 'e7b608d7a873ada4bc46aaa61d8dda63e28dfd05':
Pass the originating uid to the package verifier
2012-09-28 11:06:43 -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
Robert Greenwalt
c6fa237dae
Use updatable file for premium-sms filter
...
The data is really to big for a gservices-driven secure setting.
bug:7221402
Change-Id: Ie3d4a1a0aeb69b9ef8fad360fa7ec32e927644e8
2012-09-28 10:24:09 -07:00
Daniel Sandler
21164f2535
am d22e6d0b: am 0dc2b81c: Merge "Cleanup internal status bar APIs." into jb-mr1-dev
...
* commit 'd22e6d0b50ba293511352d6d05be33f535b75666':
Cleanup internal status bar APIs.
2012-09-28 10:13:15 -07:00
Daniel Sandler
0dc2b81ce1
Merge "Cleanup internal status bar APIs." into jb-mr1-dev
2012-09-28 10:07:16 -07:00
Romain Guy
3ecac08af5
am 8399392d: am 08874db8: Merge "Fix HierarchyViewer so it can load Contacts" into jb-mr1-dev
...
* commit '8399392d70a3cb515d68c600265638d42baf0161':
Fix HierarchyViewer so it can load Contacts
2012-09-28 00:38:24 -07:00
Adam Powell
613479391b
am d3d5b033: am ae268392: Merge "Revert "Fix adjustViewBounds handling for ImageView"" into jb-mr1-dev
...
* commit 'd3d5b03362a4cb44c389eee7dc787a907b583109':
Revert "Fix adjustViewBounds handling for ImageView"
2012-09-28 00:37:22 -07:00
Fabrice Di Meglio
3fd13cb4be
am ac7348a3: am 10a2979e: Merge "Fix bug #7249363 Icons in the Camera UI (to switch camera types and on the focus ring) are missing" into jb-mr1-dev
...
* commit 'ac7348a3228177a0e08b8be2fec88e23b82c6043':
Fix bug #7249363 Icons in the Camera UI (to switch camera types and on the focus ring) are missing
2012-09-28 00:37:11 -07:00
Svetoslav Ganov
55a014a35e
am 0bbcfe2d: am 7befb7de: Global gesture to toggle Accessibility system-wide.
...
* commit '0bbcfe2d5d359f8c16423166763ec14b22f53d88':
Global gesture to toggle Accessibility system-wide.
2012-09-28 00:37:04 -07:00
Jeff Sharkey
d15021bd07
am 095df34d: am 5e9187a3: Merge "Fix "system" resources; more context user work." into jb-mr1-dev
...
* commit '095df34d5b663c24d353d3e1b79f869cae1c8400':
Fix "system" resources; more context user work.
2012-09-28 00:37:00 -07:00
John Reck
b3c8ddade4
am 93f7d42d: am 7c72a8f9: Merge "Fix perf regression from scale/density mismatch" into jb-mr1-dev
...
* commit '93f7d42deb07bdbbc6cc0724247d6efce1f5a3e2':
Fix perf regression from scale/density mismatch
2012-09-28 00:36:49 -07:00
Jeff Sharkey
b81c7bb932
am 65f4de10: am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev
...
* commit '65f4de101fa8d5752603c6e79536c3a17f585490':
Migrate more Secure settings to Global.
2012-09-28 00:36:41 -07:00
Christopher Tate
c58027c562
am 530e78b2: am 5e08af03: Respect per-user rotation lock et alia
...
* commit '530e78b231c8cb07dd5ccdb057eff287b814662d':
Respect per-user rotation lock et alia
2012-09-28 00:36:30 -07:00
Winson Chung
26af98cbf7
am b7caca23: am 327b3217: Merge "Fixing various QS issues. (Bug 7217102)" into jb-mr1-dev
...
* commit 'b7caca23195ceb654206864ae433168256c86e89':
Fixing various QS issues. (Bug 7217102)
2012-09-28 00:36:05 -07:00
Chet Haase
06e7a030c0
am d3451ae8: am 4af11461: Merge "Force redraw of new/resized windows" into jb-mr1-dev
...
* commit 'd3451ae8e07fefad529d6abf4f48ca83e177b4fb':
Force redraw of new/resized windows
2012-09-28 00:35:13 -07:00
Jim Miller
f4ef1521cb
am bca987aa: am 42517367: Merge "Update keyguard layouts on phone" into jb-mr1-dev
...
* commit 'bca987aad3e0775f0eb063a99f54fe9792246f2e':
Update keyguard layouts on phone
2012-09-28 00:35:04 -07:00
Christopher Tate
fc3cacdb0e
am b990c001: am 3f91e43e: Merge "Full (local) restore security changes" into jb-mr1-dev
...
* commit 'b990c001e19cca13a139c1979a8a5e431d85a855':
Full (local) restore security changes
2012-09-28 00:34:22 -07:00
Fabrice Di Meglio
c1432543f6
am f119af67: am 41148af5: Merge "Fix bug #7241988 Padding is mostly set to "0"" into jb-mr1-dev
...
* commit 'f119af675b77e34e791d3b02cae9401d0fdcfc06':
Fix bug #7241988 Padding is mostly set to "0"
2012-09-28 00:34:18 -07:00
Adam Cohen
a2ba6f9202
am 080ee3ef: am 580ee8b0: Merge "Fixing AppWidgetService / AppWidgetHost to work in system process" into jb-mr1-dev
...
* commit '080ee3ef55ec32bc6a3254814f9fd717767dfa7e':
Fixing AppWidgetService / AppWidgetHost to work in system process
2012-09-28 00:33:42 -07:00
Adam Cohen
dd37f93b6c
am 21b5acc8: am 62d2d621: Merge "Fixing Keyguard widget click handling (issue 7179972)" into jb-mr1-dev
...
* commit '21b5acc8ab7e706286205639e2f4685d9bf4e551':
Fixing Keyguard widget click handling (issue 7179972)
2012-09-28 00:33:30 -07:00
Romain Guy
08874db8ed
Merge "Fix HierarchyViewer so it can load Contacts" into jb-mr1-dev
2012-09-27 23:40:56 -07:00
Romain Guy
97723b2eb4
Fix HierarchyViewer so it can load Contacts
...
Change-Id: I5d5f400a9283f9c2431d91a10f85be42b02fe6a0
2012-09-27 23:36:34 -07:00
Adam Powell
ae26839257
Merge "Revert "Fix adjustViewBounds handling for ImageView"" into jb-mr1-dev
2012-09-27 21:14:46 -07:00
Adam Powell
68f3eb3b56
Revert "Fix adjustViewBounds handling for ImageView"
...
This reverts commit b1271ac183
Revert this for now pending further investigation of bug 7248600
Change-Id: Ieb0a279fa2208f2aa575759dd6dd94476b471b8d
2012-09-27 21:05:17 -07:00
Fabrice Di Meglio
10a2979e55
Merge "Fix bug #7249363 Icons in the Camera UI (to switch camera types and on the focus ring) are missing" into jb-mr1-dev
2012-09-27 20:57:13 -07:00