Alexandra Gherghina
802669e7f8
am 3507cc0f: am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev
...
* commit '3507cc0f8474d28b834fd4382397975478c63725':
Bugfix: use the correct user for ContentResolver calls
2014-09-11 16:31:57 +00:00
Przemyslaw Szczepaniak
25183677ef
am 817dbc8c: am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev
...
* commit '817dbc8c2aa437388617238e3fb6c4dc6ecf5849':
Replace TreeSet with HashSet.
2014-09-11 16:16:24 +00:00
George Mount
6929f050ef
am 6a6c4eed: am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev
...
* commit '6a6c4eed6b1bf7f3a00b28b41d984d0113377b76':
Omit appearing views that have a parent that is also appearing.
2014-09-11 16:16:20 +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
Julia Reynolds
3fb8348ecd
am a098030f: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev
...
* commit 'a098030f70a4861a4c0f7241d8a95f1d6441e5ed':
Allow device owners to update LOCATION_MODE.
2014-09-11 16:04:20 +00:00
Przemyslaw Szczepaniak
6931cc9f41
Merge "Replace TreeSet with HashSet." into lmp-dev
2014-09-11 15:59:36 +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
ad8adc1b40
am 04d1560c: am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev
...
* commit '04d1560cac01a35776e84210b1e41038a4d7df84':
Remove package level intent forwarding.
2014-09-11 15:36:21 +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
da7835d5c3
am 576fc3ca: am c1dad5c2: Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev
...
* commit '576fc3ca6bdd5ffe606d3e36f6b8114530642d3e':
Flush HTTP socket pools and DNS cache when binding process to a Network.
2014-09-11 13:34:08 +00:00
Paul Jensen
f4f38caa29
am 09ff9d7e: am 7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev
...
* commit '09ff9d7e9823accbee65f3e44be13e8e7d9d5842':
Make Network.openConnection() share HttpHandlers not OkHttpClients.
2014-09-11 13:17:47 +00: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
bc57a08f5f
am 5f9ce5e9: am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev
...
* commit '5f9ce5e98322d328e6b0628875f73aa688a71c9e':
Use Calendar day of week rather than Time in SimpleMonthView
2014-09-11 01:57:20 +00:00
Svetoslav Ganov
4165e500f6
am b6e7e347: am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev
...
* commit 'b6e7e347c15db664411aa6d369314ae396d4c65b':
Using the correct package name for ContentResolver
2014-09-11 01:57:14 +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
24d8c17bdb
am f6f453d1: am b4ee4428: Merge "Fix issue #17428001 : Fix revokeUriPermissions" into lmp-dev
...
* commit 'f6f453d1baa77d3bed97936ffbe177d15055c8e8':
Fix issue #17428001 : Fix revokeUriPermissions
2014-09-11 01:18:09 +00:00
Lajos Molnar
40449c70d6
am b9414beb: am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev
...
* commit 'b9414beb66ef9ca14bc606256f3af781c8124901':
add android.util.SizeF.parseSizeF()
2014-09-11 01:18:01 +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
Alan Viverette
86f062d98a
am ba870607: am 78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev
...
* commit 'ba87060785fbb90ba7d0777a3938a1b95d3ee5a6':
Fix docs and nulling behavior for TextView.setCompoundDrawables
2014-09-10 23:51:39 +00: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
6b398e03c7
am 1c19026d: am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev
...
* commit '1c19026dadb9d6013f48901aaf1e6451b42f0977':
Make SearchView styles public, remove public Holo styles added in L
2014-09-10 23:38:16 +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
11aa55502e
am 86d1c5d3: am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev
...
* commit '86d1c5d370576447d7c7c713bf0f258023a1c3d4':
Fix ArrayIndexOutOfBoundsException.
2014-09-10 21:55:20 +00:00
Tao Bai
96bca16a43
am cdad4651: am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev
...
* commit 'cdad4651a1e93b0cfe2b199e39e5583ce9a19454':
Revise createIntent and parseResult API.
2014-09-10 21:55:15 +00:00
Craig Mautner
c787572762
am 99a902ed: am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev
...
* commit '99a902ed763df87484342899ebe33aa3744be420':
Wait for animation complete before completing boot
2014-09-10 21:55:05 +00:00
George Mount
05c4f7ad76
Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev
2014-09-10 21:47:58 +00:00
Tao Bai
bebc56209d
Merge "Revise createIntent and parseResult API." into lmp-dev
2014-09-10 21:43:04 +00:00
George Mount
2e9616354c
am 7726c740: am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev
...
* commit '7726c7408402872e57c36bc23add1f387ff5eb71':
Move capturing entering views until just before transition.
2014-09-10 21:38:34 +00:00
Chet Haase
da789748f3
am 969628cd: am 804df9eb: Use constant state in AnimatedVectorDrawable
...
* commit '969628cdad8f3ba8581c01c0ffbf2b224196e979':
Use constant state in AnimatedVectorDrawable
2014-09-10 21:38:29 +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
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
03d291fd5b
am fff6aab7: am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev
...
* commit 'fff6aab7826321c6005987ef4bfc88ae695ac0aa':
Remove auto spaceifying behavior on paste
2014-09-10 21:16:49 +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
7296d609f9
am a8ced922: am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
...
* commit 'a8ced9220ac8f946d5bc5d1584981434eecb562b':
Tries to resolve reference resource names instead of its data.
2014-09-10 20:53:25 +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
7c715ae007
am 6b63cd11: am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev
...
* commit '6b63cd118f2c3a82453c30618339092fa5d30323':
Camera2: Allow captures right after abort
2014-09-10 20:04:08 +00:00
Eino-Ville Talvala
657d30e7f4
Merge "Camera2: Allow captures right after abort" into lmp-dev
2014-09-10 19:48:21 +00:00