Baligh Uddin
ce803d8ed8
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-30 06:43:10 -07:00
Craig Mautner
c36c49ee83
Changing debug for b/7094175.
...
Fixes bug 7094175 (but not really).
Change-Id: Ice2abb93f479ea0bda931e9643710668c25aa285
2012-09-29 16:02:43 -07:00
Mike Cleron
eb43858ea0
am a995b6e3: Merge "Getting rid of blue outline in user switcher, instead brighten the user" into jb-mr1-dev
...
* commit 'a995b6e37f20b3e7eebfb37d8868c1bc14906204':
Getting rid of blue outline in user switcher, instead brighten the user
2012-09-28 19:44:59 -07:00
Mike Cleron
a995b6e37f
Merge "Getting rid of blue outline in user switcher, instead brighten the user" into jb-mr1-dev
2012-09-28 19:43:16 -07:00
Jim Miller
c1aa6a54a7
Integrate keyguard paging hint
...
Bug 7232481
Change-Id: I1959ae61b8f5afd055158dad67bdceecc4870d24
2012-09-28 19:37:26 -07:00
Adam Cohen
82ebe6f777
Getting rid of keyguard widget flag that isn't used
...
-> issue 7238875
Change-Id: Ifad890b4061784889f3fc7711a165452cf230fbd
2012-09-28 19:33:05 -07:00
Adam Cohen
9654329008
Getting rid of blue outline in user switcher, instead brighten the user
...
Change-Id: I4817615cc28eb1fea35ecb5c3d69c4298c9cf2cf
2012-09-28 19:28:41 -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
Jatin Lodhia
bf07c7a93f
am 7c3586c5: Merge "Make the theme for choose account and choose account type dialogs same." into jb-mr1-dev
...
* commit '7c3586c576c7f7238274f1ffbc4577a57be0d1f1':
Make the theme for choose account and choose account type dialogs same.
2012-09-28 18:53:46 -07:00
Jatin Lodhia
7c3586c576
Merge "Make the theme for choose account and choose account type dialogs same." into jb-mr1-dev
2012-09-28 18:50:20 -07:00
Jim Miller
7b4386c617
am 1ed143ea: Merge "Clean up SIM PIN and PUK screens in keyguard." into jb-mr1-dev
...
* commit '1ed143ea341d2dac29cc3aafaf2fbeb1b13c5251':
Clean up SIM PIN and PUK screens in keyguard.
2012-09-28 18:42:29 -07:00
Jim Miller
1ed143ea34
Merge "Clean up SIM PIN and PUK screens in keyguard." into jb-mr1-dev
2012-09-28 18:40:43 -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
Robert Greenwalt
9b3f7096a5
am 2c22bb85: Merge "Update Premium-SMS detection UI." into jb-mr1-dev
...
* commit '2c22bb85f2f6233eb3986f37b92386000433c7aa':
Update Premium-SMS detection UI.
2012-09-28 17:10:00 -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
Jim Miller
3efe106264
Clean up SIM PIN and PUK screens in keyguard.
...
- new flow for PUK screen
- clean up SIM and PUK screen to match UX designs
- simplified logic for showing emergency call button
Change-Id: I66fcd312f3c52dd212d9836dc020735dbc88d5ee
2012-09-28 17:01:16 -07:00
Robert Greenwalt
8f188379b5
am 2c22bb85: Merge "Update Premium-SMS detection UI." into jb-mr1-dev
...
* commit '2c22bb85f2f6233eb3986f37b92386000433c7aa':
Update Premium-SMS detection UI.
2012-09-28 17:00:57 -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
Robert Greenwalt
2c22bb85f2
Merge "Update Premium-SMS detection UI." into jb-mr1-dev
2012-09-28 16:55:44 -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
Adam Powell
67fdad9d1e
am aa64b110: Merge "String change for video routing via MediaRouter; "HDMI" not "HDMI audio."" into jb-mr1-dev
...
* commit 'aa64b11020c5283509c7ef37ecfe274a4f6b45f4':
String change for video routing via MediaRouter; "HDMI" not "HDMI audio."
2012-09-28 12:59:54 -07:00
Adam Powell
aa64b11020
Merge "String change for video routing via MediaRouter; "HDMI" not "HDMI audio."" into jb-mr1-dev
2012-09-28 12:57:14 -07:00
Adam Powell
4131a37366
String change for video routing via MediaRouter; "HDMI" not "HDMI audio."
...
Change-Id: Ifece0cf0bc11ff2ffab254c6177f9db741037df6
2012-09-28 12:52:34 -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
Svetoslav Ganov
fa24aa5ce8
am 47c52a87: Merge "Some accessibility events not sent from touch explorer if apps misbehave." into jb-mr1-dev
...
* commit '47c52a873e78d78a73abe85bb5491701a7b39feb':
Some accessibility events not sent from touch explorer if apps misbehave.
2012-09-28 12:38:06 -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
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