Rich Cannings
b38cb4da4a
am 22c5c52d: am a56d9cec: Merge "Revert "Pass URLs to package verifiers"" into jb-mr1-dev
...
* commit '22c5c52d43d055db307e6a0136180e7995db49f1':
Revert "Pass URLs to package verifiers"
2012-08-08 15:11:15 -07:00
Jean-Baptiste Queru
2c4f62672f
am a2848806: am 86d09388: am bce41358: am 9ab84c20: Merge "Fix wrong count return for getPhoneSignalStrengthCount"
...
* commit 'a2848806a746abf34e7a0e140a0ac21bef360fa2':
Fix wrong count return for getPhoneSignalStrengthCount
2012-08-08 15:10:59 -07:00
Jean-Baptiste Queru
314458c08b
am d81486d2: am 04c7923c: am 74913572: am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
...
* commit 'd81486d208062b188ce9be198f362bc69eb0c149':
StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
2012-08-08 15:10:55 -07:00
Rich Cannings
a56d9cecee
Merge "Revert "Pass URLs to package verifiers"" into jb-mr1-dev
2012-08-08 13:50:56 -07:00
Jean-Baptiste Queru
86d09388ee
am bce41358: am 9ab84c20: Merge "Fix wrong count return for getPhoneSignalStrengthCount"
...
* commit 'bce413587973eae29a783d7e273dc2f7db06f7c9':
Fix wrong count return for getPhoneSignalStrengthCount
2012-08-08 13:11:33 -07:00
Jean-Baptiste Queru
04c7923c74
am 74913572: am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
...
* commit '749135722c6edb681fc27fcbab5beba25f938d82':
StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
2012-08-08 13:11:28 -07:00
Jean-Baptiste Queru
bce4135879
am 9ab84c20: Merge "Fix wrong count return for getPhoneSignalStrengthCount"
...
* commit '9ab84c203fea0521135e0b0983aa15ce1afdc5ec':
Fix wrong count return for getPhoneSignalStrengthCount
2012-08-08 13:08:31 -07:00
Jean-Baptiste Queru
749135722c
am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
...
* commit '6fb8fe9aba75681509d84f68d536ed78d292bd44':
StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
2012-08-08 13:08:27 -07:00
Jean-Baptiste Queru
9ab84c203f
Merge "Fix wrong count return for getPhoneSignalStrengthCount"
2012-08-08 12:59:06 -07:00
Rich Cannings
e1d7c711df
Revert "Pass URLs to package verifiers"
...
This reverts commit 24713907fe
Change-Id: Ie04ba73475b813635c4a74915c45e83250801b6b
2012-08-08 12:46:06 -07:00
Jean-Baptiste Queru
6fb8fe9aba
Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
2012-08-08 12:06:26 -07:00
Nick Kralevich
af0d0aae27
am 1ce2a926: am 2caec6c6: Fix link typo.
...
* commit '1ce2a926ea6af2e0b7c2b7e34aa5dca69592290e':
Fix link typo.
2012-08-08 11:40:26 -07:00
Nick Kralevich
2caec6c682
Fix link typo.
...
Change-Id: I182b9c04caddcc4a985f206eddf5c23b06afe0e3
2012-08-08 11:33:17 -07:00
Jean-Baptiste Queru
f9f3fe9709
am 487e079b: am de9d40d4: am 64ed6b2c: am d77d17c2: Merge "Fix cursor memory leak"
...
* commit '487e079b6ac2a0f58f1ed3fc7d21343c299e7403':
Fix cursor memory leak
2012-08-08 10:59:50 -07:00
Jean-Baptiste Queru
7ebe1bfff5
am aa02a15d: am c98db2a7: am 425d13a0: am 2278e60c: Merge "Adds missing Bluetooth as network type."
...
* commit 'aa02a15d42155161593f177cfeba75763331d08d':
Adds missing Bluetooth as network type.
2012-08-08 10:59:46 -07:00
Jean-Baptiste Queru
de9d40d445
am 64ed6b2c: am d77d17c2: Merge "Fix cursor memory leak"
...
* commit '64ed6b2cfa6a4bb58f3f8a9b59d840cdce049c80':
Fix cursor memory leak
2012-08-08 10:55:46 -07:00
Jean-Baptiste Queru
c98db2a7d1
am 425d13a0: am 2278e60c: Merge "Adds missing Bluetooth as network type."
...
* commit '425d13a0aeded1f750addb2c64cd693109661415':
Adds missing Bluetooth as network type.
2012-08-08 10:55:39 -07:00
Nick Kralevich
9663215edc
am ebd997d8: am 9d16c219: Merge "Content Providers: change default for android:exported" into jb-mr1-dev
...
* commit 'ebd997d8662e52a64318b1f3c531d61e6e76bfc3':
Content Providers: change default for android:exported
2012-08-08 10:54:26 -07:00
Jean-Baptiste Queru
64ed6b2cfa
am d77d17c2: Merge "Fix cursor memory leak"
...
* commit 'd77d17c28d6f120ceb648747c7e2ef1a50215700':
Fix cursor memory leak
2012-08-08 10:54:04 -07:00
Jean-Baptiste Queru
425d13a0ae
am 2278e60c: Merge "Adds missing Bluetooth as network type."
...
* commit '2278e60c39f937b6eee14fbf0094d4be92d7f06b':
Adds missing Bluetooth as network type.
2012-08-08 10:53:52 -07:00
Nick Kralevich
9d16c219f1
Merge "Content Providers: change default for android:exported" into jb-mr1-dev
2012-08-08 10:50:05 -07:00
Jean-Baptiste Queru
d77d17c28d
Merge "Fix cursor memory leak"
2012-08-08 10:44:50 -07:00
Jean-Baptiste Queru
2278e60c39
Merge "Adds missing Bluetooth as network type."
2012-08-08 10:43:20 -07:00
Dianne Hackborn
128f16cfe0
am 852f06b3: am 53791582: Merge "More mult-user API work." into jb-mr1-dev
...
* commit '852f06b3fc84d559c2ff2ede2b8477bfd4c4ffa6':
More mult-user API work.
2012-08-08 10:27:38 -07:00
Dianne Hackborn
537915828b
Merge "More mult-user API work." into jb-mr1-dev
2012-08-08 10:22:49 -07:00
Daniel Sandler
12a4dcb0ae
am cd500c67: am 5927d957: Merge "Migrate Dreams default settings to DatabaseHelper." into jb-mr1-dev
...
* commit 'cd500c670d440564af1c84c9f5c34ea07823df35':
Migrate Dreams default settings to DatabaseHelper.
2012-08-08 08:52:30 -07:00
Daniel Sandler
5927d957ea
Merge "Migrate Dreams default settings to DatabaseHelper." into jb-mr1-dev
2012-08-08 08:47:40 -07:00
Daniel Sandler
fdb7c36a10
Migrate Dreams default settings to DatabaseHelper.
...
Also switch Dreams on for all charging devices by default.
Change-Id: Iccbcc2906d55214320b2f467e88ba9cb188f4886
2012-08-08 08:38:48 -04:00
Mikhail Naganov
ce18fd9510
Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom."
2012-08-08 02:08:58 -07:00
Mikhail Naganov
c70b1f3bd6
Merge "Remove unused BROWSER_TEXT_SIZE_CHANGE log event."
2012-08-08 02:06:36 -07:00
Mikhail Naganov
449b961740
Merge "Clarify JavaDoc of WebSettings.setAllowFileAccessFromFileURLs."
2012-08-08 02:04:13 -07:00
Mikhail Naganov
65e7ace979
Clarify JavaDoc of WebSettings.setAllowFileAccessFromFileURLs.
...
According to CTS tests (WebSettingsTest.testLocalImageLoads),
local images access is allowed regardless of the state of
AllowFileAccessFromFileURLs.
Bug: 5461416
Change-Id: I71f5c38a6b0f3720c8c369c0e19f379c78ace06f
2012-08-08 10:02:39 +01:00
Matthew Xie
773be0d650
am 693c1dc5: am 1ae86869: Merge "Auto connection/disconnection related changes" into jb-mr1-dev
...
* commit '693c1dc5b0c2e0e4e94ef9b923201c7101e6a866':
Auto connection/disconnection related changes
2012-08-08 00:36:09 -07:00
Matthew Xie
1ae86869bc
Merge "Auto connection/disconnection related changes" into jb-mr1-dev
2012-08-08 00:31:53 -07:00
Dianne Hackborn
7d19e0242f
More mult-user API work.
...
- You can now use android:singleUser with receivers and providers.
- New API to send ordered broadcasts as a user.
- New Process.myUserHandle() API.
For now I am trying out "user handle" as the name for the numbers
representing users.
Change-Id: I754c713ab172494bb4251bc7a37a17324a2e235e
2012-08-07 19:19:22 -07:00
Adam Powell
e8af49bcc3
am 8aa7f9ad: am 96f1ee98: Merge "Fix a padding resolution bug for adapter-based views" into jb-mr1-dev
...
* commit '8aa7f9ada135928a28cae1b47511e5bd20b39536':
Fix a padding resolution bug for adapter-based views
2012-08-07 18:07:50 -07:00
Adam Powell
96f1ee9867
Merge "Fix a padding resolution bug for adapter-based views" into jb-mr1-dev
2012-08-07 18:04:16 -07:00
Adam Powell
0090f20001
Fix a padding resolution bug for adapter-based views
...
If padding has not been resolved by the time measure() is called,
resolve it.
Bug 6938579
Change-Id: Idd3ffa3e4e441cd462d6594b1e20d153d7632994
2012-08-07 17:16:49 -07:00
Romain Guy
2e30fd3ec9
am 310ba5dd: am b260f353: Merge "Catch padding changes in ViewGroup to properly clip children Bug #6886339 " into jb-mr1-dev
...
* commit '310ba5dd9fba6430a9fb7735dd9394c393ff5096':
Catch padding changes in ViewGroup to properly clip children Bug #6886339
2012-08-07 15:22:41 -07:00
Romain Guy
b260f3531b
Merge "Catch padding changes in ViewGroup to properly clip children Bug #6886339 " into jb-mr1-dev
2012-08-07 14:52:35 -07:00
Romain Guy
2440e670de
Catch padding changes in ViewGroup to properly clip children
...
Bug #6886339
RTL support introduced a new way to handle padding which broke
existing behavior in ViewGroup.setPadding(). The new code path
was not notifying ViewGroup which would prevent it from setting
a flag used to clip children.
Change-Id: I584143714cb81fd664b4ecd9fb51d56bae04ba05
2012-08-07 14:43:43 -07:00
Scott Main
e6ec886a4b
am 5fef67cb: am b53e9b42: am a8583c29: am 40eee61e: docs: fix broken links and update sitemap text file
...
* commit '5fef67cbc8c234c5028cc91ef836fd2fb3f183af':
docs: fix broken links and update sitemap text file
2012-08-07 14:09:53 -07:00
Scott Main
b53e9b42c3
am a8583c29: am 40eee61e: docs: fix broken links and update sitemap text file
...
* commit 'a8583c2934836572632bb82d1fe7607392d4ca72':
docs: fix broken links and update sitemap text file
2012-08-07 14:05:28 -07:00
Scott Main
a8583c2934
am 40eee61e: docs: fix broken links and update sitemap text file
...
* commit '40eee61e25fb887f5267686f8a0a7c5bd9f95769':
docs: fix broken links and update sitemap text file
2012-08-07 14:04:04 -07:00
Adam Powell
77a572a8d3
am 60add06f: am 4224790f: Merge "Animate the action bar\'s Up chevron as it shows and hides." into jb-mr1-dev
...
* commit '60add06f3910d9f06f24b78ac69c89ad6c8deaa5':
Animate the action bar's Up chevron as it shows and hides.
2012-08-07 13:52:48 -07:00
Adam Powell
4224790ffa
Merge "Animate the action bar's Up chevron as it shows and hides." into jb-mr1-dev
2012-08-07 13:48:04 -07:00
Adam Powell
fd75eef161
Animate the action bar's Up chevron as it shows and hides.
...
Change-Id: I2cf0283cc644a62ad83cb5641b8f56cc8229b86f
2012-08-07 13:47:11 -07:00
Romain Guy
b3d8102f53
am 01069430: am 03ad783c: Merge "Cleanup of libhwui" into jb-mr1-dev
...
* commit '010694307e595a52d300334c05aac1215b864c10':
Cleanup of libhwui
2012-08-07 12:03:44 -07:00
Romain Guy
03ad783c50
Merge "Cleanup of libhwui" into jb-mr1-dev
2012-08-07 11:59:39 -07:00
Elliott Hughes
be53bae9c9
Merge "Switch DateUtils and Time over to using the CLDR for all week and month names."
2012-08-07 11:54:23 -07:00