Raph Levien
286da7b6f5
Fix for 7301594 Html.toHtml creating potentially invalid html
...
Generate <p dir="rtl"> instead of <p dir=rtl>. The form with the quotes
is cleaner and will reduce warnings in apps that consume the output.
Change-Id: Ic9879c8c882c42079598b741e897a24415d96374
2012-10-07 16:57:27 -07:00
Jeff Hamilton
82b946496e
Merge "Changes to support updating location providers." into jb-mr1-dev
2012-10-04 18:23:45 -07:00
Dianne Hackborn
0cdbd0776d
Merge "Fix issue #7290206 : Need API to get/look up user serial number" into jb-mr1-dev
2012-10-04 18:19:01 -07:00
Raph Levien
19348623fa
Merge "Updated Roboto fonts with correct T comma accent encoding" into jb-mr1-dev
2012-10-04 18:15:55 -07:00
Amith Yamasani
c192c649ba
Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev
2012-10-04 18:03:47 -07:00
Christian Robertson
439b85ef9d
Updated Roboto fonts with correct T comma accent encoding
...
Updated Roboto fonts fixing issue where Tcommaaccent and Tcedilla
characters were encoded improperly (their values were switched). This
patch addresses bug 7198855 and bug 7070912. Original was mistakenly
submitted to master but should be applied to jb-mr1-dev instead.
Also, this commit reverts the addition of RobotoCondensed-Light and its
italic, for which we don't have any build file or XML metadata support.
Change-Id: If1c592474f1f7199e98bb98edf4de6466b43fa51
2012-10-04 18:01:14 -07:00
Adam Cohen
327424d69b
Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev
2012-10-04 18:01:09 -07:00
Satoshi Kataoka
284b205387
Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev
2012-10-04 18:01:09 -07:00
Adam Powell
2ee1f6567d
Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev
2012-10-04 18:00:01 -07:00
Adam Cohen
f752202bee
Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
...
-> Also reduced calls to lockNow, and moved this call in ActivityManagerService
Change-Id: I9ba34ca902f7c0f71fa4ec302104688ca8d11f55
2012-10-04 17:53:01 -07:00
Amith Yamasani
634cf31345
Fix serial number assignment for new user on a freshly wiped device
...
Bug: 7280093
User serial number was not being bumped up from 0 on a freshly wiped device
due to the userlist not existing. This was resulting in the first 2 users
getting the same serial number, messing up C2DM message delivery. This issue
doesn't show up if you boot the device before adding a user, so it wasn't
discovered earlier.
Change-Id: I8a5d99b9ad2ccfb66a16cacac9548ba53f0be387
2012-10-04 17:34:21 -07:00
Jeff Brown
17f36d154f
Merge "Allow phone to go to sleep while in call." into jb-mr1-dev
2012-10-04 17:32:46 -07:00
Amith Yamasani
82245c199b
Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev
2012-10-04 17:29:34 -07:00
Dianne Hackborn
33f9cb8cf0
Fix issue #7290206 : Need API to get/look up user serial number
...
Change-Id: I1713215e7c205b1b66c36488f89e3fbf4572cb97
2012-10-04 17:15:10 -07:00
Victoria Lease
dfc8e799ed
Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev
2012-10-04 17:11:42 -07:00
Victoria Lease
2646b3a46a
Merge "Prevent overflow in LocationRequest.setExpireIn()" into jb-mr1-dev
2012-10-04 17:10:22 -07:00
Christopher Tate
dd2f15a563
Merge "Make sure to check write perms after rewriting destination table" into jb-mr1-dev
2012-10-04 16:52:46 -07:00
Robert Greenwalt
7fd1386b8a
Merge "Properly cancel Tether notification." into jb-mr1-dev
2012-10-04 16:50:40 -07:00
Victoria Lease
a9afaccf30
Merge "multiuser support for LocationBlacklist" into jb-mr1-dev
2012-10-04 16:49:15 -07:00
Robert Greenwalt
3cab6b0f1d
Properly cancel Tether notification.
...
When we add a second type of tethering we unify the notifications
into a single generic type. This is done by canceling the first
and replacing it, but this flow was improperly canceling, so
you could end up with orphaned tethering icons.
bug:7283605
Change-Id: I1d136f51592b4326d48578cf67b69122e45d4984
2012-10-04 16:44:26 -07:00
Adam Powell
11b999d0aa
MediaRouter/Wireless Display - correct initial state
...
Make sure we get the right initial status for wifi displays when a new
display route is first added to the MediaRouter.
Bug 7289746
Change-Id: Id41f704fc88021bd4cdf21e9f4b3c810775e1aea
2012-10-04 16:28:53 -07:00
Jeff Brown
93cbbb25a5
Allow phone to go to sleep while in call.
...
Bug: 7279383
Change-Id: Ia05490218f40a1843507b95ff48fa07910e582d4
2012-10-04 16:22:04 -07:00
Christopher Tate
34637e57fc
Make sure to check write perms after rewriting destination table
...
The write-permission check must occur after any destination-table
rewriting, otherwise any application would be able to write to
any global setting, by supplying a fraudulent "system" namespace
in the uri, but with a key name that will be redirected to global.
Bug 7289965
Change-Id: I122098a64e40d14e00d3cb6608c50aeb74faf7ce
2012-10-04 16:01:10 -07:00
Laurent Tu
941221c157
Handle other providers in isAllowedProviderSafe()
...
Add a case for isAllowedProviderSafe() to handle providers that are not
GPS/Passive/Network/Fused. For example, this is useful for mock
providers.
Bug: 7047435
Change-Id: If4799aa90a5338889c47582d45cbfc25772c9c53
2012-10-04 15:18:05 -07:00
Jeff Brown
dce8b94832
Merge "Fix parceling of display info flags." into jb-mr1-dev
2012-10-04 15:04:21 -07:00
Adam Powell
b4fad85ca0
Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev
2012-10-04 15:02:52 -07:00
James Dong
d6904819ab
Merge "Throw an exception instead of crash when a surface does not have a binding surface texture" into jb-mr1-dev
2012-10-04 15:02:07 -07:00
Jeff Brown
3f2ba6220b
Fix parceling of display info flags.
...
Bug: 7283429
Change-Id: I5365a3b06d9b9f2414f9a9d2c94b0906c41b4ece
2012-10-04 14:58:43 -07:00
Amith Yamasani
6474c4cd93
Fix dupes in initial wallpaper selection
...
Bug: 7281217
Needed to load the settings for the user, in case the user was stopped.
Change-Id: I52d1f59a7681f8c4f7d3596486accb91cb840ecf
2012-10-04 14:55:42 -07:00
Adam Powell
f3b8e6fe78
Fix regression in AbsListView CHOICE_MODE_SINGLE
...
Earlier patch reversed a few lines of code that allowed deselection of
the currently selected item in CHOICE_MODE_SINGLE. Put it back the way
it was.
Bug 7289436
Change-Id: Ia1c5f3238d2faa3dd79e474851333fda90978d3c
2012-10-04 14:53:36 -07:00
Justin Ho
b2eb0282ba
Merge "Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912" into jb-mr1-dev
2012-10-04 14:29:35 -07:00
Laurent Tu
e72fe16146
Prevent overflow in LocationRequest.setExpireIn()
...
Prevent overflow in LocationRequest.setExpireIn(), for example,
when we pass in Long.MAX_VALUE.
Bug: 7047435
Change-Id: Ie56928a59fb387173fbd3887c0ef9aede00f8152
2012-10-04 13:40:08 -07:00
John Spurlock
3c008f26ca
Merge "Disable quick settings panel in setup wizard (user 0)." into jb-mr1-dev
2012-10-04 13:13:01 -07:00
Joe Fernandez
414561cf84
am 7645936c: am ab1456ab: am e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs
...
* commit '7645936c7b223ad865abdf22b79bdfac4cf39d98':
docs: Remove Android Open Accessory docs, which are now on source.android.com
2012-10-04 13:10:30 -07:00
Joe Fernandez
7645936c7b
am ab1456ab: am e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs
...
* commit 'ab1456abad6094e527ab318294c20ec58453e4af':
docs: Remove Android Open Accessory docs, which are now on source.android.com
2012-10-04 13:08:27 -07:00
Joe Fernandez
ab1456abad
am e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs
...
* commit 'e3eeeb6d03ed8575df5e8c8dfecd4e26af2d4127':
docs: Remove Android Open Accessory docs, which are now on source.android.com
2012-10-04 13:07:15 -07:00
Joe Fernandez
e3eeeb6d03
Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs
2012-10-04 13:05:12 -07:00
Scott Main
1cea533b07
am a35333c1: am c465ae32: am 688447e5: fix the lesson title names
...
* commit 'a35333c1719b312dd7c0d0a8591ee522f6f625e7':
fix the lesson title names
2012-10-04 12:50:05 -07:00
Scott Main
a35333c171
am c465ae32: am 688447e5: fix the lesson title names
...
* commit 'c465ae324521fa1cb6e130f297fbb6da72a5072e':
fix the lesson title names
2012-10-04 12:47:59 -07:00
Scott Main
c465ae3245
am 688447e5: fix the lesson title names
...
* commit '688447e512185dab4acd9ddfc9f22066d164ff4e':
fix the lesson title names
2012-10-04 12:45:29 -07:00
Scott Main
688447e512
fix the lesson title names
...
Change-Id: I09ba41685664b92b5082376a8b9e885bf444415f
2012-10-04 12:43:05 -07:00
Dianne Hackborn
8a22919525
Merge "Fix issue #6968859 : home not exiting an ANR'd dream" into jb-mr1-dev
2012-10-04 12:41:41 -07:00
Daniel Sandler
c30b6da804
Merge "Bring back the notification panel handle peek animation." into jb-mr1-dev
2012-10-04 12:41:41 -07:00
Elliott Hughes
3594e855a4
Merge "Fix Catalan ("ca") date formatting." into jb-mr1-dev
2012-10-04 12:38:24 -07:00
Daniel Sandler
0c1b75c17b
Bring back the notification panel handle peek animation.
...
Bug: 7286201
Change-Id: Id93d6a00689ffb7f97e89af935460b1debec3850
2012-10-04 15:37:13 -04:00
Svetoslav Ganov
d367b70c4a
Merge "Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END" into jb-mr1-dev
2012-10-04 12:31:02 -07:00
John Spurlock
6ebbe1b970
Merge "Invoking the global action dialog stops dreaming." into jb-mr1-dev
2012-10-04 12:29:46 -07:00
John Spurlock
27b3819df0
Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev
2012-10-04 12:26:18 -07:00
Philip Milne
e4ed092076
Merge "Fix for bug: 7274232. Bold date on lock screen." into jb-mr1-dev
2012-10-04 12:14:45 -07:00
Daniel Sandler
0a890b3ce2
Merge "Remove Start Dreaming^W^W Sleep Now 1x1 widget." into jb-mr1-dev
2012-10-04 12:14:15 -07:00