Kristian Monsen
0fc96821b0
am 40e086c4: am 6c5e4dc2: Merge "Adding a static method to get the size of a content url" into honeycomb
...
* commit '40e086c4226ea05ebf09926a9181735ce28d6d83':
Adding a static method to get the size of a content url
2011-01-12 11:41:59 -08:00
Michael Jurka
1088552dd4
am bc534054: am b609881f: Merge "Add sym_def_app_icon to mipmap directory" into honeycomb
...
* commit 'bc5340548b52f2be5b5ae1354f7c25450b3e2966':
Add sym_def_app_icon to mipmap directory
2011-01-12 11:41:46 -08:00
Kristian Monsen
40e086c422
am 6c5e4dc2: Merge "Adding a static method to get the size of a content url" into honeycomb
...
* commit '6c5e4dc2312f0b6a3c02972c382d5a047793e734':
Adding a static method to get the size of a content url
2011-01-12 11:17:11 -08:00
Kristian Monsen
6c5e4dc231
Merge "Adding a static method to get the size of a content url" into honeycomb
2011-01-12 11:15:09 -08:00
Michael Jurka
bc5340548b
am b609881f: Merge "Add sym_def_app_icon to mipmap directory" into honeycomb
...
* commit 'b609881fb0f27c7e6fd3ec955a35d2c78a5852ab':
Add sym_def_app_icon to mipmap directory
2011-01-12 11:08:28 -08:00
Michael Jurka
b609881fb0
Merge "Add sym_def_app_icon to mipmap directory" into honeycomb
2011-01-12 11:06:44 -08:00
Chet Haase
0f29ce4951
am 0ba9ab29: am 535d5eda: Merge "New interpolator resources now found in interpolator/ directory" into honeycomb
...
* commit '0ba9ab29567b7b2fe2e5bdad23f1832b5c37d503':
New interpolator resources now found in interpolator/ directory
2011-01-12 11:06:12 -08:00
Chet Haase
0ba9ab2956
am 535d5eda: Merge "New interpolator resources now found in interpolator/ directory" into honeycomb
...
* commit '535d5edad225a2855e952a1883310c4a0fa43b72':
New interpolator resources now found in interpolator/ directory
2011-01-12 11:04:22 -08:00
Chet Haase
535d5edad2
Merge "New interpolator resources now found in interpolator/ directory" into honeycomb
2011-01-12 11:01:50 -08:00
Huahui Wu
9b93d2c027
am 012acc86: am 342bfbf9: Merge "b/3340946 Fix NPE caused by null gesture detector." into honeycomb
...
* commit '012acc86200be85d5473763478b6ae87ac502ecb':
b/3340946 Fix NPE caused by null gesture detector.
2011-01-12 11:01:11 -08:00
Huahui Wu
012acc8620
am 342bfbf9: Merge "b/3340946 Fix NPE caused by null gesture detector." into honeycomb
...
* commit '342bfbf94fa806be8fefa7ff905ba0a0b0b98df0':
b/3340946 Fix NPE caused by null gesture detector.
2011-01-12 10:59:22 -08:00
Huahui Wu
342bfbf94f
Merge "b/3340946 Fix NPE caused by null gesture detector." into honeycomb
2011-01-12 10:57:51 -08:00
Dianne Hackborn
1ebbc8a9ee
am 20acd9d9: am 6014527c: Add "min size" facility to the Window class.
...
* commit '20acd9d93d77147fb7813ef6c64112bcf82b407a':
Add "min size" facility to the Window class.
2011-01-12 10:41:49 -08:00
Dianne Hackborn
20acd9d93d
am 6014527c: Add "min size" facility to the Window class.
...
* commit '6014527c350895383b99ba91d3d009a32b1d22a6':
Add "min size" facility to the Window class.
2011-01-12 10:39:58 -08:00
Huahui Wu
8465cc9d88
b/3340946 Fix NPE caused by null gesture detector.
...
Gmail use WebView without instantiating the gesture detector. The Gmail team replied that they don't need the pinch to zoom feature so we can safely skip multi-touch events for them.
Change-Id: Id60a4d4583979ef5b420fff04c4ca097c0594024
2011-01-12 10:37:11 -08:00
Dianne Hackborn
6014527c35
Add "min size" facility to the Window class.
...
This allows us to have a new dialog theme that behaves like an alert dialog
for both Dialog and Activity versions. Very useful with so many more things
being displayed as dialogs on our nice large screen.
Note I didn't change the existing dialog themes to have this behavior, since
it will probably break things. Instead there is a new variation. And the
DialogWhenLarge variations now use this for their dialog form, to fix many
of the real new dialogs we have that need this behavior.
Removed the public definition of the one alert dialog theme. None of the
others have ever been public, this one shouldn't be.
Added new .Panel versions of the Holo themes, like we already had for the
original themes.
Changed the alert dialog layout to no longer use WeightedLinearLayout,
since the window now takes care of that. This allowed for the removal
of the xlarge version of those layouts.
Change-Id: I0c8372bde25eb9af47404a719b3f07230baf73bf
2011-01-12 10:33:13 -08:00
Kenny Root
af604587c9
Add sym_def_app_icon to mipmap directory
...
The default activity icon was a drawable so different densities were
being stripped out during build time. Copying it to the mipmap
directory allows all different scales to be used.
Bug: 3325002
Change-Id: Id7138aa243ba11c02b33f0e3e9154569542592e8
2011-01-12 10:14:21 -08:00
Patrick Scott
8c6c1deaab
am b3b7197c: (-s ours) am 92a9a3c5: Merge "Do not merge." into honeycomb
...
* commit 'b3b7197cd47f2f0df733c11c919df1e4160bdaf9':
Do not merge.
2011-01-12 09:48:46 -08:00
Patrick Scott
b3b7197cd4
am 92a9a3c5: Merge "Do not merge." into honeycomb
...
* commit '92a9a3c5ef9774863b4cee93d43b67582a02c2f0':
Do not merge.
2011-01-12 09:47:09 -08:00
Patrick Scott
92a9a3c5ef
Merge "Do not merge." into honeycomb
2011-01-12 09:44:59 -08:00
Patrick Scott
d1737edc13
Do not merge.
...
Cherry picked:
Add an api to toggle content url access.
By default, WebView allows access to content providers on the system. This
setting allows applications to turn off content urls.
Bug: 1196879
Change-Id: I49eaea6d7b9ccc3b3a4443d712222556087568c0
2011-01-12 12:42:51 -05:00
Glenn Kasten
9439b0c110
am 5ac80dde: am e5cf7f2b: Merge "Fix race in buffer ref counting." into honeycomb
...
* commit '5ac80dde0480f06a7fab9a15c2df90d6aee1ba22':
Fix race in buffer ref counting.
2011-01-12 09:38:38 -08:00
Glenn Kasten
5ac80dde04
am e5cf7f2b: Merge "Fix race in buffer ref counting." into honeycomb
...
* commit 'e5cf7f2bc51913d87bf97c8a1885f736edc5f0bc':
Fix race in buffer ref counting.
2011-01-12 09:36:00 -08:00
Glenn Kasten
e5cf7f2bc5
Merge "Fix race in buffer ref counting." into honeycomb
2011-01-12 09:34:37 -08:00
Glenn Kasten
70e8d9cb55
Merge "Bug 3229711"
2011-01-12 09:31:46 -08:00
Glenn Kasten
4e26bc686b
Fix race in buffer ref counting.
...
Change-Id: Id47c30469c3e3ec293ed2ef574a191275b5044d6
2011-01-12 09:22:07 -08:00
Cary Clark
89b911194e
am 45c67430: am 688b0af6: Merge "add null check to copy selection" into honeycomb
...
* commit '45c674304e11a819fa1244f666ab13613f411d3e':
add null check to copy selection
2011-01-12 08:23:35 -08:00
Cary Clark
45c674304e
am 688b0af6: Merge "add null check to copy selection" into honeycomb
...
* commit '688b0af6a888a8a427d9a4c82fedf3e345e6ae34':
add null check to copy selection
2011-01-12 08:21:03 -08:00
Cary Clark
688b0af6a8
Merge "add null check to copy selection" into honeycomb
2011-01-12 08:19:24 -08:00
Chet Haase
efcceb856a
New interpolator resources now found in interpolator/ directory
...
Change-Id: Ib08200d71fce1706a0c683df104f0ff3d777ca17
2011-01-12 07:41:31 -08:00
Robert Greenwalt
8403cbf100
am 1ea7e5df: am a78e9f05: Merge "Fix any_connection reporting." into honeycomb
...
* commit '1ea7e5df91f023d03fa7c87c534e6024795abaaa':
Fix any_connection reporting.
2011-01-12 07:21:32 -08:00
Robert Greenwalt
1ea7e5df91
am a78e9f05: Merge "Fix any_connection reporting." into honeycomb
...
* commit 'a78e9f055834030ebe25480004f667f4bca35232':
Fix any_connection reporting.
2011-01-12 07:19:05 -08:00
Robert Greenwalt
a78e9f0558
Merge "Fix any_connection reporting." into honeycomb
2011-01-12 07:16:56 -08:00
Cary Clark
7170bb6391
add null check to copy selection
...
This prevents a toast from appearing
if copyselection is done initially.
bug:3339016
Change-Id: If6f91b8f3794b3807fb3319fc542838abd431c64
2011-01-12 10:12:15 -05:00
Kristian Monsen
80ff5d82bd
Adding a static method to get the size of a content url
...
Part of fixes for bug 2862096
Change-Id: I86f1255c17efb367fac54b69b8de220d2874fc70
2011-01-12 10:21:17 +00:00
satok
41514d740b
am 52b18265: am 31d9d895: Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb
...
* commit '52b18265680073c02b0b0a1ff9c3d4d95a6779be':
Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals".
2011-01-12 01:21:59 -08:00
satok
52b1826568
am 31d9d895: Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb
...
* commit '31d9d895d79977fa4e6dff2491b209fbeb21c61b':
Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals".
2011-01-12 01:20:24 -08:00
satok
31d9d895d7
Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb
2011-01-12 01:17:58 -08:00
Brad Fitzpatrick
8fecde9905
am 43194ce0: am 52d70722: am cb842753: Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
...
* commit '43194ce05eef26665572fb248a108fd24d247a8f':
Closing cursor in finalizer to avoid GREF and fd leak in acore
2011-01-12 00:07:38 -08:00
Dianne Hackborn
fea13f2be7
am 5eefd98a: am a9d8a69a: am 9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
...
* commit '5eefd98aa3c461c65822cce56e04a7e5d1af2dae':
Referencing of "r.record.name" is occured, when "r.record" is null.
2011-01-12 00:07:33 -08:00
Chris Tate
e1ccc7e7b8
am ba96a561: (-s ours) am 69f8d3c6: (-s ours) am bbff7ed4: DO NOT MERGE : Ensure that the first post-restore backup pass is correct
...
* commit 'ba96a561e25754eacc0197590c4b449ad625de00':
DO NOT MERGE : Ensure that the first post-restore backup pass is correct
2011-01-12 00:07:28 -08:00
Chris Tate
16b86a142e
am 46af781a: (-s ours) am 9b1bd2c7: (-s ours) am 6ec91731: DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores
...
* commit '46af781a1cf17c324a4d58a1b70b6ce3937e3750':
DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
2011-01-12 00:07:24 -08:00
Dianne Hackborn
b34818a066
am b0735d86: am 412ebd6f: am 433863b1: Fix issue #3333958 : Package Manager can sometimes mistakenly think...
...
* commit 'b0735d86c776f942f2c883da12704696de155632':
Fix issue #3333958 : Package Manager can sometimes mistakenly think...
2011-01-12 00:07:20 -08:00
Dianne Hackborn
bf3ead87d7
am 248528cc: am 95db1cfc: am cd23823d: Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread
...
* commit '248528cc8917401e0f7fc4affa89df1912e1a43a':
2011-01-12 00:07:15 -08:00
Brad Fitzpatrick
43194ce05e
am 52d70722: am cb842753: Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
...
* commit '52d70722654548d156bd7a1cb8c1f05b94b09f06':
Closing cursor in finalizer to avoid GREF and fd leak in acore
2011-01-12 00:04:27 -08:00
Dianne Hackborn
5eefd98aa3
am a9d8a69a: am 9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
...
* commit 'a9d8a69a044c8e0c2d3268ed98bd17063faaeb1e':
Referencing of "r.record.name" is occured, when "r.record" is null.
2011-01-12 00:04:18 -08:00
Chris Tate
ba96a561e2
am 69f8d3c6: (-s ours) am bbff7ed4: DO NOT MERGE : Ensure that the first post-restore backup pass is correct
...
* commit '69f8d3c667669dc1858c21ee798c0f836f53235e':
DO NOT MERGE : Ensure that the first post-restore backup pass is correct
2011-01-12 00:04:12 -08:00
Chris Tate
46af781a1c
am 9b1bd2c7: (-s ours) am 6ec91731: DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores
...
* commit '9b1bd2c7d1acffa1079d589811450140518e5ce5':
DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
2011-01-12 00:04:04 -08:00
Dianne Hackborn
b0735d86c7
am 412ebd6f: am 433863b1: Fix issue #3333958 : Package Manager can sometimes mistakenly think...
...
* commit '412ebd6f9d18eebc11d8473318316aef1dfc5caa':
Fix issue #3333958 : Package Manager can sometimes mistakenly think...
2011-01-12 00:03:53 -08:00
Dianne Hackborn
248528cc89
am 95db1cfc: am cd23823d: Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread
...
* commit '95db1cfc741c23c7f4192128e3b7bb3c43761bdb':
2011-01-12 00:03:45 -08:00