drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
140,997 Commits 1 Branch 0 Tags
Commit Graph

140997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuncheol Heo
cdcbacfa33 Merge "Disable MHL controller." 2014-06-26 23:14:58 +00:00
Jungshik Jang
a13da0d591 Add api, setArcMode, used to turn on/off ARC. 
Usual TV can switch on and off of ARC feature in its settings page.
Along with it, removed locking block from the code,
because arc flags are accessed by actions and internal services.

Change-Id: I737ac0c2671b537551eaac202d2065cc99c6d0a0
 2014-07-01 17:25:06 +09:00
Yuncheol Heo
e265c8a5fc Disable MHL controller. 
Currently MHL HAL is not implemented yet, so it's more reasonable to
disable it.

Change-Id: I2bd9549ddecca8ece9d16a6bee569711afa7384c
 2014-07-01 17:10:10 +09:00
Robert Ly
e1ef443e9c am 9baaf2ce: am 7459dfed: Merge "docs: add new UX images for notifications and wear" into klp-modular-dev 
* commit '9baaf2ce843ec84424e10aa10cb7e367951b9306':
  docs: add new UX images for notifications and wear
 2014-07-01 02:57:11 +00:00
Robert Ly
9baaf2ce84 am 7459dfed: Merge "docs: add new UX images for notifications and wear" into klp-modular-dev 
* commit '7459dfed6c4353a9437f5c5fbbbc1738f465a432':
  docs: add new UX images for notifications and wear
 2014-07-01 02:52:30 +00:00
Jeff Brown
8fef877310 Merge "Make MediaSessionToken an inner class of MediaSession." 2014-06-30 22:24:07 +00:00
Ram
3e0e3bc617 MS: Adding Support for Emergency APN in Telephony Framework 
(base/telephony)

Replacement for https://partner-android-review.googlesource.com/#/c/171175/

Change-Id: I16fc37f5c00ed79f2370bc46554fc7a24c52c4cb
Conflicts:
	core/java/android/net/ConnectivityManager.java
 2014-07-01 02:00:51 +00:00
Jeff Brown
dba34ba35c Make MediaSessionToken an inner class of MediaSession. 
Also add some missing AIDLs to the framework makefile to ensure
they are included in the SDK.

Change-Id: If85a3091c7591e0b3bbe6cc4bb74aba2284b4f42
 2014-06-30 16:05:25 -07:00
Robert Ly
7459dfed6c Merge "docs: add new UX images for notifications and wear" into klp-modular-dev 2014-06-30 22:24:07 +00:00
Robert Ly
bdc5428410 docs: add new UX images for notifications and wear 
Change-Id: I936209db7260c77aec425f3457497cd70a66b767
 2014-06-30 19:33:37 -07:00
Quddus Chong
62395c9379 am 5212ee08: Merge "docs: Add Javadocs for GMS Longhorn." into klp-modular-dev 
* commit '5212ee08f3061c07a6a323e9169b63b596c4c824':
  docs: Add Javadocs for GMS Longhorn.
 2014-06-30 21:51:32 +00:00
Quddus Chong
69fc782a8b am 85a25e02: Merge "docs: Added "What\'s New" for GMS Longhorn (Google Play Services 5.0)" into klp-modular-dev 
* commit '85a25e02004f77595e352e03c1fdb11b6126db69':
  docs: Added "What's New" for GMS Longhorn (Google Play Services 5.0)
 2014-06-30 21:51:28 +00:00
Tim Kilbourn
6f1a231a0b am 326b1857: Merge "Fix docs" into klp-modular-dev 
* commit '326b1857a5ced49f249358751e05ce237bfaefc8':
  Fix docs
 2014-06-30 20:54:30 +00:00
Robert Ly
07fd3652aa am e1e35d13: docs: fix notifications docs 
* commit 'e1e35d13023224c22a54ce074c45d2f8729b1c60':
  docs: fix notifications docs
 2014-06-30 20:17:33 +00:00
Robert Ly
e1e35d1302 docs: fix notifications docs 
Change-Id: I14f55619ae0e0c53811c09410fec5ef8bf577ff6
 2014-06-30 13:11:39 -07:00
Quddus Chong
5212ee08f3 Merge "docs: Add Javadocs for GMS Longhorn." into klp-modular-dev 2014-06-30 17:43:33 +00:00
Brian Carlstrom
c30f36accb Update preloaded-classes for ART DO NOT MERGE 
Change-Id: If0b1bfa2fa1fc80351c11ff2936e1b204539aa64
 2014-06-30 09:30:54 -07:00
Dirk Dougherty
7ec3cf540a am 7ecb89fc: Merge "Change card title for admob." into klp-modular-dev 
* commit '7ecb89fc1e2b07e51dcc52fe6e778855dfb92c15':
  Change card title for admob.
 2014-06-30 01:06:15 +00:00
Dirk Dougherty
d64ac2a67f am 14ec9ade: Merge "Doc change: API diff 20." into klp-modular-dev 
* commit '14ec9adefa1cad0c5444bc938f0edaebaf4d1eee':
  Doc change: API diff 20.
 2014-06-30 01:06:11 +00:00
Robert Ly
c32386ea44 am 4cdf8373: add api 20 
* commit '4cdf83735de741bb44a9078b080dbdaf9db891a0':
  add api 20
 2014-06-30 01:00:08 +00:00
Robert Ly
7b7f68ec94 am 63234bf7: Merge "Revert "add API reference docs filtering for level 20"" into klp-modular-dev 
* commit '63234bf7ab9a05f2e8fb858a31af270ca82b33ad':
  Revert "add API reference docs filtering for level 20"
 2014-06-30 01:00:03 +00:00
Robert Ly
bc2b05299d resolved conflicts for merge of 4d329a8f to klp-modular-dev-plus-aosp 
Change-Id: Id8096712bc63fe16f93dca4a7963440e11087f7a
 2014-06-29 17:55:24 -07:00
Robert Ly
4cdf83735d add api 20 
DO NOT MERGE

Change-Id: Iae685158ac9c08e3a074e36d60004faf995fd1c7
 2014-06-29 16:53:54 -07:00
Robert Ly
05759ef766 am 6fff230d: Merge "docs : fix broken links" into klp-modular-dev 
* commit '6fff230d64b869ec9a3f3bb10ea5ae30b041a85a':
  docs : fix broken links
 2014-06-29 23:42:55 +00:00
Robert Ly
2b906dfb95 am 50b55d61: docs: update notifications docs 
* commit '50b55d61af63098d0b95e38afdc5c381b3373cd6':
  docs: update notifications docs
 2014-06-29 23:42:50 +00:00
Robert Ly
50b55d61af docs: update notifications docs 
Change-Id: I0473c75c31c4012dbb3fc81d155da237f8f1f7fd
 2014-06-29 16:20:28 -07:00
Scott Main
e2af77e635 am 7b5abd15: Merge "docs: fix L Preview G+ links (permanently)" into klp-modular-dev 
* commit '7b5abd15ab15c9f36783dd00c1953d9cf16c33f7':
  docs: fix L Preview G+ links (permanently)
 2014-06-28 02:39:37 +00:00
smain@google.com
fa8e81135a am d2b869d0: revisions to the app structure design guide 
* commit 'd2b869d052e65958545f2dc49c3eef8ff0066280':
  revisions to the app structure design guide
 2014-06-28 02:32:24 +00:00
Robert Ly
49ba77b441 am 4c42ab4b: (-s ours) Merge "Revert "Add api 20 to list used by reference docs."" into klp-modular-dev 
* commit '4c42ab4ba59d75eca4883ece2944c30ca36b760f':
  Revert "Add api 20 to list used by reference docs."
 2014-06-28 02:32:19 +00:00
Robert Ly
684abbb448 am e774eb93: (-s ours) Merge "Add api 20 to list used by reference docs." into klp-modular-dev 
* commit 'e774eb939875c02135c7ce9af8e81322a7c0ab59':
  Add api 20 to list used by reference docs.
 2014-06-28 02:26:16 +00:00
smain@google.com
d2b869d052 revisions to the app structure design guide 
Change-Id: I15e68e454180b848db81791350ba7985817c0930
 2014-06-27 18:43:50 -07:00
smain@google.com
323d0c56aa am 67421351: Merge "fix links to wear downloads" into klp-modular-dev 
* commit '67421351cc6fd99aef741bb3bc2599bcb1288d1d':
  fix links to wear downloads
 2014-06-27 22:57:57 +00:00
Quddus Chong
559c0060bb docs: Add Javadocs for GMS Longhorn. 
Change-Id: I2662b0af0609450364cbcc4666535fd57eec3ce7
 2014-06-27 13:31:17 -07:00
Robert Ly
00a05a902f am 6ebcfb87: docs: notif image 
* commit '6ebcfb87b8111ee7110aeade6fba35e1862528da':
  docs: notif image
 2014-06-27 18:17:19 +00:00
Robert Ly
6ebcfb87b8 docs: notif image 
Change-Id: I2ee3e1da39297f74c8142875c3e71fb0953f5a46
 2014-06-27 11:12:04 -07:00
Robert Ly
b76f6afeca am 137d9da3: Merge "docs: fix images for notifications" into klp-modular-dev 
* commit '137d9da3aab652dccc82f4b5741d1c48b8b6cfe9':
  docs: fix images for notifications
 2014-06-27 18:03:41 +00:00
Robert Ly
a1180f7b72 am 5627b521: Merge "fix build" into klp-modular-dev 
* commit '5627b521e058058b2496a076256b727e0635ea88':
  fix build
 2014-06-27 17:21:18 +00:00
Robert Ly
672b1d13c9 am ba102925: Merge "more doc fixes for notifcations and wear" into klp-modular-dev 
* commit 'ba1029257999fbfc6c7741d05cee10b8f2036f2f':
  more doc fixes for notifcations and wear
 2014-06-27 17:13:40 +00:00
Quddus Chong
85a25e0200 Merge "docs: Added "What's New" for GMS Longhorn (Google Play Services 5.0)" into klp-modular-dev 2014-06-27 16:52:20 +00:00
Tim Kilbourn
326b1857a5 Merge "Fix docs" into klp-modular-dev 2014-06-27 16:52:20 +00:00
Tim Kilbourn
3eabe93438 Fix docs 
Update a few references to the Leanback theme.

https://code.google.com/p/android/issues/detail?id=72757

Change-Id: I47387433cc02fd29b62b729bc34756cef1d539f3
 2014-06-30 13:36:55 -07:00
Scott Main
7b5abd15ab Merge "docs: fix L Preview G+ links (permanently)" into klp-modular-dev 2014-06-27 16:52:20 +00:00
Joe Fernandez
f50f51cfbd docs: fix L Preview G+ links (permanently) 
Change-Id: I699ae07a977495a23c3cb0f440f90c856bc17a3e
 2014-06-27 17:00:59 -07:00
Robert Ly
5627b521e0 Merge "fix build" into klp-modular-dev 2014-06-27 16:52:20 +00:00
Robert Ly
af0ce935c3 fix build 
Change-Id: I66278269f8f02358c6d2529ef8839eb1ea42fdc4
 2014-06-27 10:13:58 -07:00
Robert Ly
939765f842 more doc fixes for notifcations and wear 
Change-Id: I9f0d168a8ebafb778924919766910b79504ebf68
 2014-06-27 10:07:03 -07:00
Dirk Dougherty
7ecb89fc1e Merge "Change card title for admob." into klp-modular-dev 2014-06-27 15:56:14 +00:00
Dirk Dougherty
8da8820a70 Change card title for admob. 
Change-Id: Ia4b4eaf7bbd54e9c546f740a5095431081d1ebd9
 2014-06-27 15:59:15 -07:00
Dirk Dougherty
14ec9adefa Merge "Doc change: API diff 20." into klp-modular-dev 2014-06-27 15:56:14 +00:00
Dirk Dougherty
1663876b5a Doc change: API diff 20. 
Change-Id: I1d3e00c1e62568c04abe6531819e75873df235c0
 2014-06-27 16:44:11 -07:00