Fabrice Di Meglio
840ea01fcb
am 93cea34a: am f2e5cf48: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
...
* commit '93cea34a7f7834f42f921402415f7797b677e442':
Fix bug #6427629 Clean up layout direction APIs
2012-10-01 10:14:31 -07:00
Jeff Brown
843b014aca
am 489c1e9f: am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev
...
* commit '489c1e9f82250770004ec9080778546b040f6146':
Get rid of preventScreenOn().
2012-10-01 10:13:52 -07:00
Dianne Hackborn
d698542867
am 66e92752: am 84215565: Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
...
* commit '66e92752260e4ef21e77a44379f3a6b8969b4d65':
Fix issue #7255954 : API Review: rename Dream to DreamService
2012-10-01 10:13:25 -07:00
Fabrice Di Meglio
93cea34a7f
am f2e5cf48: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
...
* commit 'f2e5cf487e9bda4da1b902cb5c816ba48c9b7004':
Fix bug #6427629 Clean up layout direction APIs
2012-09-30 10:55:18 -07:00
Fabrice Di Meglio
f2e5cf487e
Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
2012-09-30 10:53:26 -07:00
Jeff Brown
489c1e9f82
am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev
...
* commit '7f813202cb08a829b59e17be749ffee4a2f482b8':
Get rid of preventScreenOn().
2012-09-28 19:08:17 -07:00
Jeff Brown
7f813202cb
Merge "Get rid of preventScreenOn()." into jb-mr1-dev
2012-09-28 19:05:52 -07:00
Fabrice Di Meglio
343e11345e
Fix bug #6427629 Clean up layout direction APIs
...
- remove onPaddingChanged(int) and fold it into onRtlPropertiesChanged(int)
Change-Id: I1d7f02d2b4538c6c991bd4285501bbc73e6aa5c3
2012-09-28 18:26:07 -07:00
Jeff Brown
120664816a
Get rid of preventScreenOn().
...
Bug: 7165399
Change-Id: I1968265ecd74fff4d85efd2ca03b1983425ea518
2012-09-28 18:21:36 -07:00
Dianne Hackborn
66e9275226
am 84215565: Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
...
* commit '84215565dd5dda84db7fd35b8ae4ccb571465cd2':
Fix issue #7255954 : API Review: rename Dream to DreamService
2012-09-28 18:20:02 -07:00
Dianne Hackborn
84215565dd
Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
2012-09-28 18:17:13 -07:00
Dianne Hackborn
be87e2f588
Fix issue #7255954 : API Review: rename Dream to DreamService
...
Change-Id: I89ecf2c3ec4fef09c0495aa68de11576f9cfd872
2012-09-28 17:42:39 -07:00
Adam Powell
7fb07337f8
am 4984ec72: Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev
...
* commit '4984ec7222d86a9b507a9961363bf50d2b72df1b':
Fix adjustViewBounds handling for ImageView
2012-09-28 17:09:51 -07:00
Fabrice Di Meglio
d35b2dc7cc
am be290dd8: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev
...
* commit 'be290dd850c8e2c31830e2a87205499586f55353':
Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
2012-09-28 17:09:45 -07:00
Dianne Hackborn
752cb20245
am 3ff8e1a8: Merge "Fix issue #7211769 and #7244492 , thrash around on #7226656." into jb-mr1-dev
...
* commit '3ff8e1a80058e5557d13693d3223e1aa011c0038':
Fix issue #7211769 and #7244492 , thrash around on #7226656 .
2012-09-28 17:09:37 -07:00
Robert Greenwalt
a6c9a612af
resolved conflicts for merge of 925a659d to jb-mr1-aah-dev
...
Change-Id: I520c5df139c88cc0fecaeffdc9e2b5eb8dd352aa
2012-09-28 17:00:00 -07:00
Jean-Baptiste Queru
3c45765a2a
Merge from jb-mr1-aah-dev
...
Change-Id: I4deb6ff1d3c9e00aefacbe772227bf43c139ecca
2012-09-28 16:44:18 -07:00
Adam Powell
4984ec7222
Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev
2012-09-28 16:15:36 -07:00
Fabrice Di Meglio
be290dd850
Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev
2012-09-28 16:12:15 -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
d5edc77217
Fix adjustViewBounds handling for ImageView
...
When computing the adjusted view bounds, don't constrain the
dimensions by the original estimate if the opposite dimension has a
fixed size. This can result in the view never getting properly
enlarged.
Also fix a long-standing bug in MeasureSpec.makeMeasureSpec where
oversized or negative values could result in broken packed values.
Bug 7240251
Change-Id: I359d108ff52b6f3b5c4bf393d2271d28999c0127
2012-09-28 15:52:36 -07:00
Fabrice Di Meglio
15bbde41da
Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
...
- fix padding issue. Need to update padding if layout direction change
Change-Id: I2924c1b94c7ef054dd9bd670de4c5c206f52e412
2012-09-28 15:49:38 -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
04fc799196
am 29dcd656: Merge "Track offset of center child view in Gallery for later layouts" into jb-mr1-dev
...
* commit '29dcd656dfa4c22855b12fb6ee7d6e2e4c4844c1':
Track offset of center child view in Gallery for later layouts
2012-09-28 14:17:00 -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
347a0d6c87
am 07ddb460: Merge "NumberPicker should adjust min and max when displayed values are set." into jb-mr1-dev
...
* commit '07ddb460afca09640e18b28bfedcaecfe5b2a838':
NumberPicker should adjust min and max when displayed values are set.
2012-09-28 14:11:29 -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
82c0eba3f7
am fd4da14c: Merge "Add Settings.Secure.USER_SETUP_COMPLETE" into jb-mr1-dev
...
* commit 'fd4da14c8304912dcb8ee54d4597527c2ee0d2d2':
Add Settings.Secure.USER_SETUP_COMPLETE
2012-09-28 12:50:21 -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
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
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
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
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
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
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
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
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
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
ea33318bb0
am 0dc2b81c: Merge "Cleanup internal status bar APIs." into jb-mr1-dev
...
* commit '0dc2b81ce1400ae23faa5cc386caeef235856307':
Cleanup internal status bar APIs.
2012-09-28 10:11:10 -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
864e87576b
am 08874db8: Merge "Fix HierarchyViewer so it can load Contacts" into jb-mr1-dev
...
* commit '08874db8ed9f81f1d0f205bbffe87f913e50bc57':
Fix HierarchyViewer so it can load Contacts
2012-09-27 23:43:00 -07:00