Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Winson Chung
e6a2068c27 Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev automerge: b55f7d7 
automerge: 0baa55a

* commit '0baa55a74342b558139879201bd55d4f8cc8e5a8':
  Fixing potential crash when the task loader is stopped. (Bug 18135583)
 2014-10-28 00:37:10 +00:00
Jeff Sharkey
a7a3479a85 Merge "Check upgrade certs before permissions." into lmp-mr1-dev automerge: e795533 
automerge: 05cff40

* commit '05cff4047d1c1d0552ce52a6af0151c6b1cc8e4f':
  Check upgrade certs before permissions.
 2014-10-28 00:36:08 +00:00
John Reck
c7c8b06940 Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad 
automerge: 49a01fc

* commit '49a01fc7dc8d2b9cc7591a94d19f3c209e470aea':
  Cleanup debug options
 2014-10-28 00:35:14 +00:00
Alan Viverette
7a21011a2d Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev automerge: 3847552 
automerge: 5a01fcd

* commit '5a01fcd194bea9cf001709f32247ad851cd5a0dc':
  Fix min/max date range in DatePicker calendar mode
 2014-10-28 00:34:22 +00:00
Wale Ogunwale
7e003ba751 Merge "Added documentation for various window frame types." into lmp-mr1-dev automerge: 674f55e 
automerge: e1c6d89

* commit 'e1c6d898177bb694ad84ccb1940f3e3df074a290':
  Added documentation for various window frame types.
 2014-10-28 00:33:30 +00:00
Alan Viverette
7e79fd3ee2 Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev automerge: 253626b 
automerge: b64176b

* commit 'b64176bd87e08bcb952d6c22eea7ffd9a8b6df62':
  Clean up some javadocs in Window.setFeature...()
 2014-10-28 00:32:19 +00:00
Jeff Sharkey
720147e249 Merge "Follow API removal." into lmp-mr1-dev automerge: d634d39 
automerge: 19022f6

* commit '19022f6991e2d681dfdc8d5e6464557647a1faa1':
  Follow API removal.
 2014-10-28 00:31:14 +00:00
Mike Lockwood
bfdc6b50f4 Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev automerge: ac7d8c5 
automerge: 9f08a9f

* commit '9f08a9f08a3440e1f4a0b60c3e0cc5fe3dd71f27':
  Improve toString() methods for audio classes to help with debugging
 2014-10-28 00:29:57 +00:00
Jeff Sharkey
a38592ae5d Merge "Follow ArraySet refactoring." into lmp-mr1-dev automerge: 9c81373 
automerge: 817722b

* commit '817722bb36e81ef0216fd1c75a9174e08238f954':
  Follow ArraySet refactoring.
 2014-10-28 00:29:03 +00:00
Jeff Sharkey
a148a0dc66 Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527 
automerge: a5921b9

* commit 'a5921b9b79a1d95e8a41bd74998cab82b153cb0a':
  Drop DEV network stats to save RAM.
 2014-10-28 00:27:07 +00: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
John Reck
b0aeaad442 Merge "Cleanup debug options" into lmp-mr1-dev 2014-10-27 23:27:30 +00:00
Jason Monk
4444c5b278 Add missing passive discovery flag 
MediaProjectionManagerService had an active media callback which
was causing a service to be bound 100% of the time.  Adding a
passive flag makes it only observe events, and allow the service
to only be bound when needed by apps requesting active discovery.

Bug: 18042409
Bug: 17969854
Change-Id: I1bfa6609e2aa507ee2ce227de50f0e5ae951e000
 2014-10-27 19:25:50 -04:00
Eric Gilmore
d126294a8f Docs: Adding Android Studio instructions for adding IAB service. 
Incorporating some editorial feedback both in and outside the
scope of my small bug fix.

Bug: 17151052
Change-Id: Id3b0c256ca6f7f018fa525eeb1f78979e8f476df
 2014-10-27 23:24:39 +00:00
Alan Viverette
384755230c Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev 2014-10-27 23:16:26 +00:00
Wale Ogunwale
674f55e515 Merge "Added documentation for various window frame types." into lmp-mr1-dev 2014-10-27 23:05:39 +00:00
Alan Viverette
253626b822 Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev 2014-10-27 22:39:12 +00:00
Jeff Sharkey
c28bd3532b Check upgrade certs before permissions. 
We're now checking for permission redefinition early during the
install process, which can result in a confusing error message when
the real problem is a mis-signed app.  So do a quick signature
sanity check before checking permissions.

Bug: 18095637
Change-Id: I9a9b48da9c5dc7fb9bde6f3f338ea08e53b6b705
 2014-10-27 15:38:27 -07:00
Ying Wang
475d7393bf Update current.txt with generics to field types. 
automerge: 79775d4

* commit '79775d4bc4fa71994942dbd1d441aa62827c34be':
  Update current.txt with generics to field types.
 2014-10-27 22:35:59 +00:00
Jeff Sharkey
19022f6991 Merge "Follow API removal." into lmp-mr1-dev 
automerge: d634d39

* commit 'd634d39c605553e669a16fd8fd406aa4695f54af':
  Follow API removal.
 2014-10-27 22:19:21 +00:00
Mike Lockwood
9f08a9f08a Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev 
automerge: ac7d8c5

* commit 'ac7d8c5cc85dc5929b5d1c9d7836aca58a4e9ea5':
  Improve toString() methods for audio classes to help with debugging
 2014-10-27 22:18:05 +00:00