Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
Dianne Hackborn
3cec76c455 am 1fa1dd50: am f6f453d1: am b4ee4428: Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 
* commit '1fa1dd50bad987722c8907b1b305597884b7cc65':
  Fix issue #17428001: Fix revokeUriPermissions
 2014-09-11 17:27:48 +00:00
Lajos Molnar
5a52457fab am 7fca7f55: am b9414beb: am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 
* commit '7fca7f55f21cd34b94ace89167f6516228520bff':
  add android.util.SizeF.parseSizeF()
 2014-09-11 17:27:43 +00:00
Alan Viverette
a75f6b3159 am b2f46415: am ba870607: am 78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev 
* commit 'b2f46415d2a05e25a9eca912060958ac0d827c59':
  Fix docs and nulling behavior for TextView.setCompoundDrawables
 2014-09-11 17:26:57 +00:00
Alan Viverette
cfd3deef7d am 28d22bd2: am 1c19026d: am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 
* commit '28d22bd23b219fc65eb80da04945fc0b72100040':
  Make SearchView styles public, remove public Holo styles added in L
 2014-09-11 17:26:40 +00:00
George Mount
10dcaa134f am b13022fd: am 86d1c5d3: am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev 
* commit 'b13022fd5fc168a70cd833dc355ee7ae05938891':
  Fix ArrayIndexOutOfBoundsException.
 2014-09-11 17:25:07 +00:00
Tao Bai
b1664bd741 am 42a3b372: am cdad4651: am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev 
* commit '42a3b372b5c41f5fe9b3c4e8645a924e32dd0443':
  Revise createIntent and parseResult API.
 2014-09-11 17:24:48 +00:00
Craig Mautner
de1c660b36 am 242c891a: am 99a902ed: am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev 
* commit '242c891a8896977c90254a838b8f36fa165fdb6f':
  Wait for animation complete before completing boot
 2014-09-11 17:24:32 +00:00
George Mount
6381c728ae am 92eba9f0: am 7726c740: am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev 
* commit '92eba9f08abd508a849209c09328a3b1b3eb5c33':
  Move capturing entering views until just before transition.
 2014-09-11 17:24:04 +00:00
Chet Haase
1368cbb2e9 am 35dc5ec9: am 969628cd: am 804df9eb: Use constant state in AnimatedVectorDrawable 
* commit '35dc5ec9877b468cba32c60b729bfded559a5c5a':
  Use constant state in AnimatedVectorDrawable
 2014-09-11 17:24:00 +00:00
Mathieu Chartier
1527c49cce am 752139e2: am 410d0de7: am 6a593012: Merge "Change EmptyArray System.identityHashCode to Object.hashCode." into lmp-dev 
* commit '752139e23f07e69a478dc541296a7cd7b7970021':
  Change EmptyArray System.identityHashCode to Object.hashCode.
 2014-09-11 17:23:13 +00:00
Raph Levien
cfbcca8992 am 75e39a46: am fff6aab7: am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev 
* commit '75e39a46e1df35bfd3f77b4583b31ca24888651e':
  Remove auto spaceifying behavior on paste
 2014-09-11 17:23:07 +00:00
Jon Miranda
0b50acd03f am ea01c7d4: am a8ced922: am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev 
* commit 'ea01c7d4ff251d6702ca687b5bf83f7928a30aaa':
  Tries to resolve reference resource names instead of its data.
 2014-09-11 17:22:44 +00:00
Eino-Ville Talvala
c060183610 am 88720d12: am 6b63cd11: am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev 
* commit '88720d12694af351811572c3de80e9a1eae7c637':
  Camera2: Allow captures right after abort
 2014-09-11 17:22:02 +00:00
Amith Yamasani
735350449c am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev 
* commit '30a5e35bb2541f89f90b12d690085451c814a1dc':
  Apply cross-user restrictions to Shell
 2014-09-11 16:54:51 +00:00
Amith Yamasani
f58e532e01 Merge "Apply cross-user restrictions to Shell" into lmp-dev 2014-09-11 16:46:34 +00:00
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
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
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
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
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
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
a104fb92c0 am 022cfcda: Merge "Fix issue #17414533: update batterystats occasionally takes a couple..." into lmp-dev 
* commit '022cfcda265079cc694079db43bd58efcbd4958a':
  Fix issue #17414533: update batterystats occasionally takes a couple...
 2014-09-11 15:59:23 +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
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
Robert Greenwalt
500c2e7c2c am efee3dea: am 5ad894d6: am eb843b14: Merge "Don\'t accept score below 0." into lmp-dev 
* commit 'efee3dea05d39d458519c259604394da91a7a722':
  Don't accept score below 0.
 2014-09-11 14:16:53 +00:00
Jeff Davidson
9441a44c6d am e966d4d8: am 426a5429: am cfd0e5c1: Merge "Update unclear Fragment Javadoc." into lmp-dev 
* commit 'e966d4d86c140b059158504e615042daa7d8e04f':
  Update unclear Fragment Javadoc.
 2014-09-11 14:15:50 +00:00
Ruben Brunk
09f0d12d3a am 2868a44d: am 7ac22597: am 17fcb255: Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev 
* commit '2868a44d846345308fd0784ee3a31b280af66e9f':
  camera2: Fix preview stretching in LEGACY mode.
 2014-09-11 14:15:03 +00:00
Esteban Talavera
92f2cadf07 am bfb49179: am 52437ed7: am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev 
* commit 'bfb491793470f70cddcc7433a68f072a752aec41':
  Update string value for provisioning action and extra
 2014-09-11 14:14:34 +00:00
Jason Monk
b01080dcd2 am b92f1d78: am 6a747735: am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev 
* commit 'b92f1d7809da77cdef37d8ea2fff7a6beeb0094d':
  Move zen mode constants and code to framework
 2014-09-11 14:13:51 +00:00
John Spurlock
7377b57689 am cbd0cdc2: am 736196b2: am 82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev 
* commit 'cbd0cdc297a140179b583c613591933d6fa8a643':
  Zen: make Condition available over @SystemApi
 2014-09-11 14:13:45 +00:00
George Mount
5aadc5e322 am 57980dca: am 568b3fe9: am 1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev 
* commit '57980dca613fee54e4993ea3cd12dd928b1fe007':
  Use intrinsic size for path animation in AnimatedVectorDrawable
 2014-09-11 14:13:37 +00:00
George Mount
9f874eaaaf am c58233b2: am 557b3f66: am bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev 
* commit 'c58233b2a4c6f51eafd2be5544bbcf45faa9a7ec':
  Fix fade transition not working with Activity Transitions.
 2014-09-11 14:13:32 +00:00
John Spurlock
613d076fa5 am 56e64b2a: am 88c61af5: am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev 
* commit '56e64b2a589a09786caa1eb1d9bfa59292a227f2':
  Zen: Make condition providers available via @SystemApi.
 2014-09-11 14:13:24 +00:00