Adam Powell
0278c2fcba
Don't let ScrollView intercept touch events if it can't scroll.
...
Bug 6872104
Change-Id: Iee643e052acc37485a8ec45b7af8be0783fb1a95
2012-07-31 16:39:32 -07:00
Fabrice Di Meglio
fba3bf97d4
Merge "Improve Toast RTL support" into jb-mr1-dev
2012-07-31 12:26:52 -07:00
Jeff Sharkey
16ef577917
Merge "API to adjust network stats. DO NOT MERGE." into jb-mr1-dev
2012-07-31 12:09:54 -07:00
Jeff Sharkey
e7ed1ce4c8
API to adjust network stats. DO NOT MERGE.
...
Enables system apps to correctly account network usage performed on
behalf of another application.
Bug: 6695246
Change-Id: I39e243afd57936b6b30157a6ca511a17b6c55c39
2012-07-31 11:45:17 -07:00
Kenny Root
e23ae144cc
am fa74f7e0: am bba948dc: Merge "Delay AccountManagerService initialization" into jb-dev
...
* commit 'fa74f7e04fcad1258a1b85515547dba0466086d8':
Delay AccountManagerService initialization
2012-07-31 11:19:40 -07:00
Kenny Root
fa74f7e04f
am bba948dc: Merge "Delay AccountManagerService initialization" into jb-dev
...
* commit 'bba948dc9e95baab9e6fb728927aada4a00d93de':
Delay AccountManagerService initialization
2012-07-31 11:17:11 -07:00
Kenny Root
bba948dc9e
Merge "Delay AccountManagerService initialization" into jb-dev
2012-07-31 11:14:02 -07:00
Nick Pelly
5dcbe638ee
am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev
...
* commit '1af5ac1b6801c4da2ef689449fd1fd2eba1ff48e':
DO NOT MERGE. Add package-name-prefix blacklist for location updates.
2012-07-31 09:20:25 -07:00
Fabrice Di Meglio
025f9602ee
Improve Toast RTL support
...
- simplier code
Change-Id: Ifbe8545697404ed6e9f508103bd9cf1e7efb5746
2012-07-30 19:00:22 -07:00
Dianne Hackborn
d913cf1859
Merge "New API level 17 for JB MR1." into jb-mr1-dev
2012-07-30 18:34:36 -07:00
Dianne Hackborn
435cdb4604
New API level 17 for JB MR1.
...
Change-Id: If71ce3b521fe17578feb5c2a2f7fd65696720554
2012-07-30 17:37:04 -07:00
Kenny Root
26ff6626fc
Delay AccountManagerService initialization
...
Since applications can have Account providers, they need to be delayed
until after PackageManagerService says everything is mounted.
Otherwise the accounts associated with that provider will be removed
immediately when startup happens.
Bug: 6820670
Change-Id: Iba81765260421649f706624d0605a40ebc1347b1
2012-07-30 16:28:44 -07:00
Fabrice Di Meglio
3330ae59ff
Merge "Improve Toast RTL support" into jb-mr1-dev
2012-07-30 14:40:32 -07:00
Fabrice Di Meglio
bf0bc63def
Improve Toast RTL support
...
- use Locale from Context
Change-Id: Ic93bb6e3f9310d54d879c20754c9310154940565
2012-07-30 14:06:58 -07:00
James Dong
7267babae3
Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev
2012-07-30 13:37:08 -07:00
Nick Pelly
48c5eb018b
DO NOT MERGE. Add package-name-prefix blacklist for location updates.
...
The Settings.Secure value locationPackagePrefixBlacklist and
locationPackagePrefixWhitelist contains comma seperated package-name
prefixes.
Location & geo-fence updates are silently dropped if the receiving
package name has a prefix on the blacklist. Status updates are
not affected. All other API's work as before.
A content observer is used so run-time updates to the blacklist
apply immediately. There is both a blacklist and a whitelist.
The blacklist applies first, and then exemptions are allowed
from the whitelist. In other words, if your package name prefix
matches both the black AND white list, then it is allowed.
Change-Id: I4ea2ad56fa6bd75d32151bc250ac25c26a5777c4
2012-07-30 13:17:30 -07:00
Fabrice Di Meglio
619e4dca8e
Merge "Improve ListPopupWindow RTL support" into jb-mr1-dev
2012-07-30 11:29:20 -07:00
Fabrice Di Meglio
1d3d7da331
Improve ListPopupWindow RTL support
...
- add Javadoc for new method setLayoutDirection()
- fix one issue where the layout direction would not be set
when the popup was recreated
Change-Id: Ic53a8b0d01dc86e03e9bf5f09195af77404dca39
2012-07-30 11:27:31 -07:00
Jeff Brown
fa14d824d2
Merge "Move and rename user activity event type constants." into jb-mr1-dev
2012-07-27 18:23:22 -07:00
Jeff Brown
af3fb2325e
Merge "Flatten power manager wake lock constants." into jb-mr1-dev
2012-07-27 18:21:19 -07:00
Jeff Brown
e288e180bb
Merge "Implement equals() and hashCode() like a good little object." into jb-mr1-dev
2012-07-27 18:18:51 -07:00
Jeff Brown
722565a67d
Merge "Fix inconsistency in user activity types." into jb-mr1-dev
2012-07-27 18:17:28 -07:00
Jeff Brown
b696de5c10
Move and rename user activity event type constants.
...
Change-Id: Ie565808796773b6896e71ddfac6aaaf8031de846
2012-07-27 18:14:56 -07:00
Jeff Brown
155fc70252
Flatten power manager wake lock constants.
...
We only support a few basic kinds of wake locks. Rather than
pretend that we could support other weird combinations of features,
just get rid of the feature bits.
Deprecated other wake lock types. We really want to encourage
developers to use FLAG_KEEP_SCREEN_ON instead of managing
their own wake locks, even though its behavior is not
exactly equivalent.
Change-Id: Idfeb0bc6efff0ef2736e47f72a06e69e5a16996e
2012-07-27 18:14:54 -07:00
Jeff Brown
94838913ab
Implement equals() and hashCode() like a good little object.
...
Change-Id: I06fc8f96586c72095ffa142d52fbd71af05cee97
2012-07-27 18:14:53 -07:00
Jeff Brown
df693de4fe
Fix inconsistency in user activity types.
...
Looks like BatteryStats was not updated when we reduced the number
of user activity types from 7 to 3.
Change-Id: I7465f86c78baa561a6555c33f681553b870827f2
2012-07-27 18:14:52 -07:00
James Dong
a0ba79473b
Enabled application using VideoView to get information events from MediaPlayer
...
o related-to-bug: 6851811
Change-Id: I78a73a33b6ddfaea76f2ba13b6990c153fb696c6
2012-07-27 18:05:11 -07:00
Adam Cohen
6089a88ca5
am 86371474: am 47db02ba: Merge "No longer parceling FixedSizeRemoteViewsCaches" into jb-dev
...
* commit '86371474de700494d9b7b324c8650858d9b18b50':
No longer parceling FixedSizeRemoteViewsCaches
2012-07-27 17:45:00 -07:00
Adam Cohen
86371474de
am 47db02ba: Merge "No longer parceling FixedSizeRemoteViewsCaches" into jb-dev
...
* commit '47db02bad8fed67025669c41ef0c0dd9cafe7ed2':
No longer parceling FixedSizeRemoteViewsCaches
2012-07-27 17:42:30 -07:00
Jeff Sharkey
ab88f9864e
Merge "Split NST handler events away from CS internals." into jb-mr1-dev
2012-07-27 16:04:56 -07:00
Adam Cohen
4a9df8dda5
No longer parceling FixedSizeRemoteViewsCaches
...
-> Related to issue 6854767
Change-Id: Ib9a9ef827a739ef9efbe6f11dcc4765004fa0c51
2012-07-27 16:04:40 -07:00
Nick Kralevich
89630ec877
Merge "ClipData: html attribute values should always be escaped" into jb-mr1-dev
2012-07-27 14:46:19 -07:00
Fabrice Di Meglio
bad7eed8aa
Merge "Add removeRule() to RelativeLayout LayoutParams" into jb-mr1-dev
2012-07-27 14:08:16 -07:00
Fabrice Di Meglio
5b5a6579cf
Merge "Make SearchView RTL aware" into jb-mr1-dev
2012-07-27 13:59:20 -07:00
Craig Mautner
706708d5aa
Merge "Small step towards supporting multiple displays" into jb-mr1-dev
2012-07-27 13:59:20 -07:00
Nick Kralevich
c92db39137
ClipData: html attribute values should always be escaped
...
Failure to properly escape HTML attribute values can lead to
XSS attacks. Technically, HTML of the form
<a href="http://www.google.com/search?x=a&y=b ">blah</a>
is malformed (but widely accepted). Such links should be written as
<a href="http://www.google.com/search?x=a&y=b ">blah</a>
See: http://www.w3.org/TR/1999/REC-html401-19991224/appendix/notes.html#h-B.2.2
Change-Id: I188ded00b4cac44acb38884d4728c4cf9500f3b6
2012-07-27 13:27:00 -07:00
Fabrice Di Meglio
a4c1030870
Add removeRule() to RelativeLayout LayoutParams
...
- add this helper API as there are already several example of
developers doing it "by hand"
Change-Id: Icd15edfd75eb47de1f90f847b263b4d513c13810
2012-07-27 13:16:42 -07:00
Fabrice Di Meglio
3a69bea302
Make SearchView RTL aware
...
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)
Change-Id: I7e7b51dccdd3b111e0594509334579b0502d24c8
2012-07-27 13:12:39 -07:00
Craig Mautner
6881a10557
Small step towards supporting multiple displays
...
Change-Id: I353449c2b464394988c7e0203656b5851a0c9127
2012-07-27 13:04:51 -07:00
Scott Main
527d14dc3c
am 587616a6: am cdd0c59a: docs: add links to new Settings dev guide
...
* commit '587616a670cfa4dc532e30643052b428cd376138':
docs: add links to new Settings dev guide
2012-07-26 22:34:55 -07:00
Matthew Xie
ada1f638b6
Merge "Reset priority on unbond" into jb-mr1-dev
2012-07-26 21:15:24 -07:00
Matthew Xie
1103d0056c
Merge "Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled" into jb-mr1-dev
2012-07-26 20:54:47 -07:00
Matthew Xie
ab455da364
Merge "handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped." into jb-mr1-dev
2012-07-26 20:38:40 -07:00
Ravi Nagarajan
82e57fe174
Reset priority on unbond
...
Change-Id: I8232c666bde26235ad527c96e5218fc1b3e7a1db
2012-07-26 19:20:32 -07:00
Swaminatha Balaji
c61eb2617d
Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
...
Change-Id: I82d05eacb6c7fae6eb1ebf246d2fce7314ff0a75
2012-07-26 19:19:51 -07:00
Syed Ibrahim M
305f240dc1
handle NullPointerException in cases where a proxy
...
call to AdapterService is called after Adapter
Service is stopped.
Change-Id: I009787f03f9a013b9b06fcb7e3f6241c850f8cd2
2012-07-26 18:11:23 -07:00
Scott Main
587616a670
am cdd0c59a: docs: add links to new Settings dev guide
...
* commit 'cdd0c59a0108036895796dcb2bea69ff5eef26ca':
docs: add links to new Settings dev guide
2012-07-26 17:41:01 -07:00
Scott Main
cdd0c59a01
docs: add links to new Settings dev guide
...
Change-Id: I04444ec0c4c1c278569b64f15cbbc7e8c1c623cd
2012-07-26 17:03:51 -07:00
Fabrice Di Meglio
e2386c184a
Make CheckedTextView RTL aware - DO NOT MERGE
...
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)
Change-Id: Ic647e105571e01e9773e4c27e9f52997d24c408e
2012-07-26 16:54:06 -07:00
Jeff Sharkey
4c628eba48
Split NST handler events away from CS internals.
...
Instead of sharing event space, use a different handler backed by
the same looper.
Change-Id: I11f1e4701c341665770ca640f3cba0c295bb7561
2012-07-26 14:09:09 -07:00