Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,750 Commits 3 Branches 0 Tags
d98e7c1df774eb86a67310f5cbc0dbdd91f33c19
Commit Graph

164750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ari Sachter-Zeltzer
20edd05327 Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev 2014-10-28 08:58:23 +00:00
Erik Kline
8fc600d1a8 Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev 
automerge: dd91fb4

* commit 'dd91fb44743f15ee308a4cfedeca6338b6912fdc':
  (re)define the definition of "provisioned"
 2014-10-28 07:57:29 +00:00
Erik Kline
dd91fb4474 Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev 2014-10-28 07:53:37 +00:00
Lorenzo Colitti
35261c4351 am 111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev 
* commit '111cc9f511dc65006fc2972c9ecbf295619e09b9':
  Change removeStackedLink to take an interface name.
 2014-10-28 07:13:09 +00:00
Lorenzo Colitti
111cc9f511 Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev 2014-10-28 07:00:31 +00:00
Lorenzo Colitti
f3cab63ef2 Change removeStackedLink to take an interface name. 
This simplifies callers.

Also remove all "implementations" of addStackedLink and
removeStackedLink except the one in LinkProperties, because they
are unused.

Bug: 12111730
Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e
 2014-10-28 15:13:57 +09:00
Erik Kline
d3b9fd33c6 (re)define the definition of "provisioned" 
Specifically:

    [1] provide a hasIPv4(), and
    [2] a hasIPv6()

each of which requires an IP address, a default route, and
address-family-specific DNS servers to evaluate to true.

Additionally:

    [3] redefine isProvisioned() to return the logical OR
        of [1] and [2] above.

Any external caller can still use any of the has*() methods to
construct its own, different definition of "provisioned".

Bug: 17769720
Change-Id: Ia692fb8508484ff403d3920c94d0e1db4563f807
 2014-10-28 14:47:42 +09:00
Lajos Molnar
e4c7a65140 Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev 
automerge: aab38b7

* commit 'aab38b7ea0b1774d158789772d0f6b1b99c1d3c9':
  MediaCodec/Image: handle null cropRect correctly
 2014-10-28 04:11:38 +00:00
Lajos Molnar
aab38b7ea0 Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev 2014-10-28 03:28:18 +00:00
Joe Fernandez
40bf63e0f0 Merge "docs: Update timing of Android Wear app review" into lmp-docs 2014-10-28 03:25:40 +00:00
Joe Fernandez
a3c9be01e8 docs: Update timing of Android Wear app review 
Change-Id: If3d31a9828b5934a871964139b8abc6b12fe8586
 2014-10-27 20:22:52 -07:00
Griff Hazen
eb19a9bb8a DO NOT MERGE Fix lmp-sprout-dev build for generics addition automerge: 732e4ec -s ours 
automerge: d1cbf9a  -s ours

* commit 'd1cbf9a8703a0fa2eefd9ad0f565f99120b61c3b':
  DO NOT MERGE Fix lmp-sprout-dev build for generics addition
 2014-10-28 03:08:11 +00:00
Jason Monk
8ae1a5e10e Add missing passive discovery flag automerge: 4444c5b automerge: 07faf0e 
automerge: e585740

* commit 'e58574026b265b4773f1e9bc896ba53530c7a580':
  Add missing passive discovery flag
 2014-10-28 03:07:22 +00:00
Ying Wang
dbfdebfff8 Update current.txt with generics to field types. automerge: 79775d4 automerge: 475d739 -s ours 
automerge: bc66de0

* commit 'bc66de0df9421ea0ffc36a1a6f6d8fd8bd7dfcda':
  Update current.txt with generics to field types.
 2014-10-28 03:05:59 +00:00
David Friedman
3c00bc01f9 Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs 2014-10-28 02:51:32 +00:00
David Friedman
576a4b7371 Updates Notifications screenshot for Android 5.0. 
Change-Id: Ib5a3f88ef5d9e580550a18d83568913d6b5d3cef
 2014-10-27 19:29:45 -07:00
Griff Hazen
d1cbf9a870 DO NOT MERGE Fix lmp-sprout-dev build for generics addition 
automerge: 732e4ec  -s ours

* commit '732e4ecbee3168c19e49469934f0e1cd3268e001':
  DO NOT MERGE Fix lmp-sprout-dev build for generics addition
 2014-10-28 02:23:34 +00:00
Jason Monk
e58574026b Add missing passive discovery flag automerge: 4444c5b 
automerge: 07faf0e

* commit '07faf0e1a1d32408dfdc863a0996baa8522c5fdb':
  Add missing passive discovery flag
 2014-10-28 02:21:20 +00:00
Ying Wang
bc66de0df9 Update current.txt with generics to field types. automerge: 79775d4 
automerge: 475d739  -s ours

* commit '475d7393bf0cbb80dd1911df30a6ba0292da09c3':
  Update current.txt with generics to field types.
 2014-10-28 02:20:25 +00:00
Griff Hazen
732e4ecbee DO NOT MERGE Fix lmp-sprout-dev build for generics addition 
Change-Id: I66f10264476df5504086a7fbc24d729798187d05
 2014-10-27 19:19:22 -07:00
Yuncheol Heo
522e0afa0f Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev 
automerge: 571cc6b

* commit '571cc6b19511b07d77418b1f0288eb467d367a9a':
  CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>.
 2014-10-28 01:57:50 +00:00
Alan Viverette
8e448aff2d Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev 
automerge: e5d27a2

* commit 'e5d27a22a6908026d346e86389cf414b5badeab6':
  Play CLICK sound effect when compound buttons are clicked
 2014-10-28 01:56:59 +00:00
Ying Wang
bf438996e0 Update current.txt with generics to field types. 
automerge: 80c9fbe

* commit '80c9fbe36fe8b1e298a70c465e85ee677fc12e12':
  Update current.txt with generics to field types.
 2014-10-28 01:55:59 +00:00
Luan Nguyen
418239190b am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs 
automerge: aec7c97

* commit 'aec7c974eb223b5608bbd2bb06e11fc397e6ffb2':
  docs: fixed typo/grammar issues.
 2014-10-28 01:44:10 +00:00
Joe Fernandez
3d76f6a957 am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
automerge: 90f734e

* commit '90f734eb180619eb8ffd2e30580f72b500184f8b':
  docs:Added 64-bit image note from Preview page
 2014-10-28 01:43:13 +00:00
Natalie Masse
9f6ea5841c am 1e5bb861: Link and typo fixed 
automerge: bcf9ced

* commit 'bcf9ced47a123220271fcca70f71c2adf69ad100':
  Link and typo fixed
 2014-10-28 01:42:13 +00:00
Scott Rowe
e0da6ddc08 am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
automerge: a1e3063

* commit 'a1e3063ebe04c8c304f48a02117085962f75cb63':
  docs: update reference to FragmentRetainInstance
 2014-10-28 01:41:06 +00:00
Joe Fernandez
d6ed5752da am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
automerge: 2f9ea27

* commit '2f9ea27c6c95fa53eef0228edc0b3f63dbeb21e7':
  Typo fixed in sample code
 2014-10-28 01:40:11 +00:00
Prashant Malani
a8f4b8a260 Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev 
automerge: 645e017  -s ours

* commit '645e017ca54e654c34b131235e90589a7d92ce0c':
  DO NOT MERGE Add empty ArrayList check.
 2014-10-28 01:39:14 +00:00
Ricardo Cervera
884b473ad8 am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
automerge: dc1f308

* commit 'dc1f308048a732572fae3cf92ddfe5cd943c0059':
  docs: Fixing notify link. Bug: 17571861
 2014-10-28 01:38:14 +00:00
Luan Nguyen
cc8b36706c am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
automerge: c07a288

* commit 'c07a288a889ac88282118d4089e969f20c1aabe3':
  docs: Android Wear Design fixes
 2014-10-28 01:37:14 +00:00
smain@google.com
870afdb39a am 075531ae: add the butterbar for L announce to Preview landing page 
automerge: e43bb6a

* commit 'e43bb6a9ec8cd0841926e7df8cc738d5357814c1':
  add the butterbar for L announce to Preview landing page
 2014-10-28 01:36:21 +00:00
smain@google.com
469c8c8983 am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
automerge: 6fbe299

* commit '6fbe299fa5bcc084cd69899afdc3c77767b7c1f5':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-28 01:35:28 +00:00
Ricardo Cervera-Navarro
4687757290 am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
automerge: c93723b

* commit 'c93723bdf9b2ce4dc0426817b8bec924d9f97a79':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-28 01:34:31 +00:00
Rich Slogar
d84910b06b am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
automerge: 858cfad

* commit '858cfad9482817305cc5b846102c3f8e5d12782a':
  docs:SDK tools 23.0.5 Release Note
 2014-10-28 01:33:39 +00:00
Yuncheol Heo
571cc6b195 Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev 2014-10-28 01:04:07 +00:00
Alan Viverette
e5d27a22a6 Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev 2014-10-28 00:57:11 +00:00
Jason Monk
07faf0e1a1 Add missing passive discovery flag 
automerge: 4444c5b

* commit '4444c5b27874866f18cd8f4abb8914cc17857ea7':
  Add missing passive discovery flag
 2014-10-28 00:52:56 +00:00
Alan Viverette
d4e7790fee Play CLICK sound effect when compound buttons are clicked 
Also plays the sound effect when the switch changes state as a result
of dragging, since that's effectively the same as the click action.

BUG: 16308311
Change-Id: Ic187ece2a8190082617f5ac7aaf05c3511fa80b5
 2014-10-27 17:50:51 -07:00
Ying Wang
80c9fbe36f Update current.txt with generics to field types. 
Bug: 17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
 2014-10-27 17:42:04 -07:00
Eric Gilmore
068cb36877 Merge commit 'a4eb81b' into klp-modular-dev-plus-aosp 
Conflicts:
	docs/html/guide/topics/connectivity/nfc/nfc.jd
 2014-10-27 17:15:23 -07:00
Winson Chung
0baa55a743 Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev 
automerge: b55f7d7

* commit 'b55f7d79d19e8d8786fab8faabedb2f253bfacf8':
  Fixing potential crash when the task loader is stopped. (Bug 18135583)
 2014-10-27 23:53:52 +00:00
Jeff Sharkey
05cff4047d Merge "Check upgrade certs before permissions." into lmp-mr1-dev 
automerge: e795533

* commit 'e79553355b10815be2cd44f7b84ae39c91a12bb1':
  Check upgrade certs before permissions.
 2014-10-27 23:53:00 +00:00
John Reck
49a01fc7dc Merge "Cleanup debug options" into lmp-mr1-dev 
automerge: b0aeaad

* commit 'b0aeaad442e6cd4920d75a63d65a91267cf9199a':
  Cleanup debug options
 2014-10-27 23:42:35 +00:00
Alan Viverette
99b4e85073 Update drag-to-open menu close behavior 
Menu now closes if the user opens using long-press and then lifts their
finger when touching outside of the menu. This is consistent with the
normal drag-to-open interaction model.

BUG: 16352041
Change-Id: I06aafae7b702ef44000ed19707c46e2bb595095e
 2014-10-27 16:42:26 -07:00
Alan Viverette
5a01fcd194 Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev 
automerge: 3847552

* commit '384755230c52f0951820ba496f300959dcc84ead':
  Fix min/max date range in DatePicker calendar mode
 2014-10-27 23:41:44 +00:00
Wale Ogunwale
e1c6d89817 Merge "Added documentation for various window frame types." into lmp-mr1-dev 
automerge: 674f55e

* commit '674f55e515d0895475d136f7793f6ce9929d859c':
  Added documentation for various window frame types.
 2014-10-27 23:40:54 +00:00
Winson Chung
b55f7d79d1 Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev 2014-10-27 23:39:11 +00:00
Alan Viverette
b64176bd87 Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev 
automerge: 253626b

* commit '253626b822b3b20fdb9727705593b4b5b55b8553':
  Clean up some javadocs in Window.setFeature...()
 2014-10-27 23:39:09 +00:00
Jeff Sharkey
e79553355b Merge "Check upgrade certs before permissions." into lmp-mr1-dev 2014-10-27 23:35:58 +00:00