Alexandra Gherghina
88de59f096
am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev
...
* commit 'e667e41bb60cbe5e6bde545ecaf1c7d9c8b36af1':
Bugfix: use the correct user for ContentResolver calls
2014-09-11 16:21:27 +00:00
Alexandra Gherghina
ffb6343938
Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev
2014-09-11 16:12:59 +00:00
Przemyslaw Szczepaniak
676a422fa0
am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev
...
* commit 'b0a86a068abf500f1ee2292cfac79af7f6830dfa':
Replace TreeSet with HashSet.
2014-09-11 16:11:31 +00:00
George Mount
2c563d5ffc
am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev
...
* commit '1ca196bb7db9105b3ede380ce259a1c45b30a964':
Omit appearing views that have a parent that is also appearing.
2014-09-11 16:11:28 +00:00
Julia Reynolds
c889315c66
am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev
...
* commit '086bf8e1ef3beac49adea005a1e3275605cd4a41':
Allow device owners to update LOCATION_MODE.
2014-09-11 16:02:45 +00:00
Alexandra Gherghina
557186b0ac
am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev
...
* commit 'b04106ed46919030b944b02a8a227f8fe343c5a5':
Remove package level intent forwarding.
2014-09-11 16:02:15 +00:00
Paul Jensen
36ef999b11
am c1dad5c2: Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev
...
* commit 'c1dad5c2e953535f61a6438a13cee40088786d58':
Flush HTTP socket pools and DNS cache when binding process to a Network.
2014-09-11 16:01:59 +00:00
Paul Jensen
db5a70b82f
am 7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev
...
* commit '7f1343eec6a94092236044381b92d8085605ee4f':
Make Network.openConnection() share HttpHandlers not OkHttpClients.
2014-09-11 16:01:55 +00:00
Alan Viverette
63eb94ae73
am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev
...
* commit '515699a4a0235d8cd39fd586067e9d2857e6bda4':
Use Calendar day of week rather than Time in SimpleMonthView
2014-09-11 15:59:37 +00:00
Przemyslaw Szczepaniak
6931cc9f41
Merge "Replace TreeSet with HashSet." into lmp-dev
2014-09-11 15:59:36 +00:00
Svetoslav Ganov
47f09dc91c
am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev
...
* commit 'f0ccea9264761b45d55f7d98c234cfb3afde79be':
Using the correct package name for ContentResolver
2014-09-11 15:59:34 +00:00
Dianne Hackborn
35fc269dc6
am b4ee4428: Merge "Fix issue #17428001 : Fix revokeUriPermissions" into lmp-dev
...
* commit 'b4ee4428d34002aea54e9dc62902f14dedf69604':
Fix issue #17428001 : Fix revokeUriPermissions
2014-09-11 15:59:19 +00:00
Lajos Molnar
b8f6ebf028
am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev
...
* commit '3b22910c898f26e604f7823b65c0f4d02e396ffb':
add android.util.SizeF.parseSizeF()
2014-09-11 15:59:15 +00:00
Alan Viverette
d509a2dfa6
am 78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev
...
* commit '78f863c7c00948817ede61ec59e47c990009b00d':
Fix docs and nulling behavior for TextView.setCompoundDrawables
2014-09-11 15:58:35 +00:00
Alan Viverette
cdd5221105
am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev
...
* commit '8b5ef83e1ba6ae3584d041654726315e996fe2d5':
Make SearchView styles public, remove public Holo styles added in L
2014-09-11 15:58:27 +00:00
Przemyslaw Szczepaniak
3786bc5498
Replace TreeSet with HashSet.
...
Both Locale and Voice do not implement Comparable.
Bug: 17467923
Change-Id: I683577e5b18ae1892e1ccea5ea241e1d016c9517
2014-09-11 16:56:46 +01:00
George Mount
27d83aa9a8
Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev
2014-09-11 15:53:36 +00:00
Julia Reynolds
d86734b469
Merge "Allow device owners to update LOCATION_MODE." into lmp-dev
2014-09-11 15:46:07 +00:00
Alexandra Gherghina
02b6addb53
Merge "Remove package level intent forwarding." into lmp-dev
2014-09-11 15:17:21 +00:00
Adam Connors
e107c3eb79
Remove package level intent forwarding.
...
Clean up unused methods.
Bug: 17389110
Change-Id: I8a80fe3e14219f06572de05c390cdda0efcbf5db
2014-09-11 15:42:13 +01:00
Paul Jensen
204dc65f37
Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev
2014-09-11 13:15:22 +00:00
Paul Jensen
5236971bbf
Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev
2014-09-11 12:57:33 +00:00
Alan Viverette
0c1964e76d
Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev
2014-09-11 01:22:55 +00:00
Svetoslav Ganov
b1467faa23
Merge "Using the correct package name for ContentResolver" into lmp-dev
2014-09-11 01:21:21 +00:00
Dianne Hackborn
547f6e1803
Merge "Fix issue #17428001 : Fix revokeUriPermissions" into lmp-dev
2014-09-11 00:55:25 +00:00
Lajos Molnar
5b54c9fb2a
Merge "add android.util.SizeF.parseSizeF()" into lmp-dev
2014-09-11 00:55:06 +00:00
Paul Jensen
07ed07459a
Make Network.openConnection() share HttpHandlers not OkHttpClients.
...
HttpHandler and HttpsHandler classes have a lot of bug fixes baked into
them that the Network.openConnection() API should be using, for example
disabling SPDY support.
bug:17420465
Change-Id: I9f1472753a542d1dd6bffde3a60c37a9145098aa
2014-09-11 00:25:50 +00:00
Alan Viverette
5878076456
Use Calendar day of week rather than Time in SimpleMonthView
...
BUG: 17377360
Change-Id: I685f35b760c049edaa8934eccaf5ce1bbf326cf2
2014-09-10 17:09:13 -07:00
Craig Stout
e988ee1eb2
Omit appearing views that have a parent that is also appearing.
...
b/17460766
Change-Id: Ib3fe619e271688c93a5cd4cb4d557e6cca5baa34
2014-09-10 23:44:30 +00:00
Alan Viverette
593f2d33bb
Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev
2014-09-10 23:31:04 +00:00
Alan Viverette
7ff0270e7d
Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev
2014-09-10 23:29:13 +00:00
Dianne Hackborn
192679a7d3
Fix issue #17428001 : Fix revokeUriPermissions
...
You can now revoke permissions that were granted to you.
Change-Id: I9a1872059edc715b10bbd2d653e45420d43331c3
2014-09-10 16:20:24 -07:00
Alan Viverette
362f984df3
Make SearchView styles public, remove public Holo styles added in L
...
We shouldn't adding styles for a deprecated theme. Also this cleans up
the removed public resources for easier deletion later.
BUG: 17455273
Change-Id: I2c5caf354aab91463702f25c38f0dd29c153ba44
2014-09-10 16:05:35 -07:00
Xin Guan
2bcb97bfb5
Using the correct package name for ContentResolver
...
Change-Id: I0518391f7262c78043fbd42ddfefef0f2451382c
2014-09-10 15:19:16 -07:00
George Mount
9b727adc6c
am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev
...
* commit '0b46b9133b6c7d19c316d9d8ae472aafdfce4029':
Fix ArrayIndexOutOfBoundsException.
2014-09-10 21:51:54 +00:00
Tao Bai
a0df890b46
am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev
...
* commit '3350edacefea92e2dfb5ad07a7b719334db8f157':
Revise createIntent and parseResult API.
2014-09-10 21:51:50 +00:00
George Mount
05c4f7ad76
Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev
2014-09-10 21:47:58 +00:00
Craig Mautner
9830962083
am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev
...
* commit 'cef60b6ac6e490803a1b14d4a4214e097cc5d269':
Wait for animation complete before completing boot
2014-09-10 21:46:57 +00:00
Tao Bai
bebc56209d
Merge "Revise createIntent and parseResult API." into lmp-dev
2014-09-10 21:43:04 +00:00
Craig Mautner
ebcd9189e3
Merge "Wait for animation complete before completing boot" into lmp-dev
2014-09-10 21:33:43 +00:00
George Mount
d56c779602
am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev
...
* commit 'b74b8d498f584dc5b51b67190da45e266f95edf3':
Move capturing entering views until just before transition.
2014-09-10 21:32:08 +00:00
Chet Haase
f4e67d69c7
am 804df9eb: Use constant state in AnimatedVectorDrawable
...
* commit '804df9eb62ed13668aacbd1609640a92846932f9':
Use constant state in AnimatedVectorDrawable
2014-09-10 21:26:49 +00:00
George Mount
4245e161c6
Merge "Move capturing entering views until just before transition." into lmp-dev
2014-09-10 21:26:23 +00:00
Chet Haase
6f6578e81c
Use constant state in AnimatedVectorDrawable
...
Complex animated vector drawables can be expensive to load due to
sub-optimal parsing of the String-based pathData. Suffering that penalty
every time the same drawable is loaded (such as material-themed
ProgressBars) is painful.
The new approach caches constant state of both the VectorDrawable (including
the pathData geometry) and the animators (which includes potentially expensive
path-based interpolators).
issue #17366831 Material ProgressBar taking 200+ms to inflate
Change-Id: Iba3b541e24cfce8c07f5aa9fe6aa7d7b92b2fe1c
2014-09-10 21:21:53 +00:00
Raph Levien
968882e760
am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev
...
* commit 'a31b4f03f6a98edcd8ae97900e9b1b24957ae4e0':
Remove auto spaceifying behavior on paste
2014-09-10 21:05:25 +00:00
Raph Levien
20dbc370e3
Merge "Remove auto spaceifying behavior on paste" into lmp-dev
2014-09-10 20:55:51 +00:00
Jon Miranda
90981b1311
am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
...
* commit 'cfb0664eb37e09ed352991f65dc7135ba00f5fa6':
Tries to resolve reference resource names instead of its data.
2014-09-10 20:43:05 +00:00
Jon Miranda
83e3ec9d4e
Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
2014-09-10 20:34:08 +00:00
Eino-Ville Talvala
b8dbb01409
am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev
...
* commit '90229edc689b3faebe215ce4841d1bf39d848bb5':
Camera2: Allow captures right after abort
2014-09-10 19:52:53 +00:00
Eino-Ville Talvala
657d30e7f4
Merge "Camera2: Allow captures right after abort" into lmp-dev
2014-09-10 19:48:21 +00:00