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

141035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Ly
e774eb9398 Merge "Add api 20 to list used by reference docs." into klp-modular-dev 2014-06-27 15:56:14 +00:00
Dirk Dougherty
99296a12c0 Add api 20 to list used by reference docs. 
Change-Id: Icdf0e9238846f943db527becde92d38f362a9f32
 2014-06-27 15:44:19 -07:00
Robert Ly
034bd9cd58 am af19c795: Merge "fix gmscore preview isntructions" into klp-modular-dev 
* commit 'af19c795e275b1e7d16fad351b3a14f74ef29088':
  fix gmscore preview isntructions
 2014-06-27 14:35:28 +00:00
smain@google.com
f106d5279f am 3822bf89: change the G+ community link 
* commit '3822bf8935310f8f94a534b986a2af935336d7e8':
  change the G+ community link
 2014-06-27 01:19:21 +00:00
smain@google.com
3822bf8935 change the G+ community link 
Change-Id: I68d453062232b739c3fdaee193eb9a20cd03d8f8
 2014-06-26 18:12:51 -07:00
Ricardo Cervera
eb63c4cd6e am cf54f881: docs: Replaced image in L Preview material docs 
* commit 'cf54f881aced94aec5df3b956cfc6b380cbc6b87':
  docs: Replaced image in L Preview material docs
 2014-06-27 01:03:39 +00:00
Ricardo Cervera
cf54f881ac docs: Replaced image in L Preview material docs 
Change-Id: I7db905f0fc8ae2bf9826d74bc7030d5a41cd2859
 2014-06-26 17:53:12 -07:00
Robert Ly
63234bf7ab Merge "Revert "add API reference docs filtering for level 20"" into klp-modular-dev 2014-06-26 23:50:27 +00:00
Robert Ly
7b7d2ac12d Revert "add API reference docs filtering for level 20" 
This reverts commit 7d7d4d6b86bdbfc54c63830351cf8d2f3830b68a.

Change-Id: I41e89bf297cb11db62601b3df0e6c655d7579007
 2014-06-29 23:49:46 +00:00
Robert Ly
7d7d4d6b86 add API reference docs filtering for level 20 
Change-Id: Iaab9d0965511d0394e7be29adb0fbcfd2904b857
 2014-06-29 16:39:06 -07:00
Robert Ly
6fff230d64 Merge "docs : fix broken links" into klp-modular-dev 2014-06-26 23:50:27 +00:00
Robert Ly
cfe7582a11 docs : fix broken links 
Change-Id: I75d8cbe8abe904bba44cc64d5557c8e14060cb8a
 2014-06-29 16:38:21 -07:00
Robert Ly
4d329a8f12 Merge "add API reference docs filtering for level 20" into klp-modular-dev 2014-06-26 23:40:51 +00:00
Amith Yamasani
374041a63d Merge "Add a method to set a profile owner and active admin at once" 2014-06-26 23:19:11 +00:00
Amith Yamasani
aba4f1b54a Add a method to set a profile owner and active admin at once 
This can be used by system apps to register a profile owner during setup

Bug: 15922051
Change-Id: Iee1b5adeb47d7e40ab36df18e3a057d8ee430f46
 2014-07-01 15:36:12 +05:30
Narayan Kamath
aeaf87fe45 Update javadoc for android.os.Bundle. 
Call out the fact that defaultValue is returned if a null
mapping exists for a given key.

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

(cherry picked from commit ca2197b0457b1626b95a053d835ceaca43ac0286)

Change-Id: Iec70478ae091bb222be6e9ef9726c817395e9e23
 2014-07-01 09:03:10 +00:00
Amith Yamasani
f2d4fa8c78 Merge "Store and retrieve default Guest settings" 2014-06-26 23:14:58 +00:00
Amith Yamasani
e4afaa3a3d Store and retrieve default Guest settings 
Save the default guest restrictions for use when a guest is created.

Bug: 15761405
Change-Id: I28db7d823944b0b47527a4909c10cc856c842a62
 2014-07-01 10:29:46 +05:30
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
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
Jinsuk Kim
854157308e Merge "Refactor handling sequences in HdmiControlService" 2014-06-26 23:19:11 +00:00
Mudumba Ananth
177d078d90 Add WBS support on Bluedroid (6/6) 
Bug 13764086

Change-Id: I7afbddb02fc247d7799ab0fb264a467c7853cb32
 2014-06-30 22:44:24 +00:00
Jinsuk Kim
92b77cf9cb Refactor handling sequences in HdmiControlService 
- Rewrote some methods to match more closely to the handling
  sequences in guideline
- Added setControlEnabled() API in the aidl
- Handled <Routing Control> command
- Handled some scenarios invoking RoutingControlAction

Change-Id: I5db0c6fc775cef709c2e0f338b85937deebf2a54
 2014-07-01 07:28:41 +09:00
Sailesh Nepal
92222a0051 Merge "More fixes for Connection and RemoteConnection" 2014-06-26 23:50:27 +00:00
Sailesh Nepal
091768c302 More fixes for Connection and RemoteConnection 
Various clean ups and fixes:
  - allow remote connection to have audio set
  - allow remote connection to have abort
  - move onPostDialWait from ConnectionService to Connection
  - hide APIs we don't need

Change-Id: Ib2d0b40f2e9e7a6b5fbf5d6db48b509b7db3c906
 2014-06-30 15:23:53 -07:00
Quddus Chong
280d1398e2 am 62395c93: am 5212ee08: Merge "docs: Add Javadocs for GMS Longhorn." into klp-modular-dev 
* commit '62395c9379449a44f2df7754ed2fe3a945e38685':
  docs: Add Javadocs for GMS Longhorn.
 2014-06-30 21:57:24 +00:00
Quddus Chong
28dc271a04 am 69fc782a: am 85a25e02: Merge "docs: Added "What\'s New" for GMS Longhorn (Google Play Services 5.0)" into klp-modular-dev 
* commit '69fc782a8bdb09da25c5052381d15f3ff3b0cb3a':
  docs: Added "What's New" for GMS Longhorn (Google Play Services 5.0)
 2014-06-30 21:57:19 +00:00
Tyler Gunn
807de8aa76 Fixing crash in phone app due to missing null checks pertaining to 
CallVideoProvider.

Change-Id: Ifd5a558a2b36e0cb656c9a57f64ae0744425a3ef
 2014-06-30 21:26:05 +00:00
Anish Athalye
80c7a40dcd Merge "Implement line breaking using ICU break iterator" 2014-06-27 16:52:20 +00:00
Anish Athalye
88b5b0be88 Implement line breaking using ICU break iterator 
Change-Id: I4ad98757aa2eab5dbc2ae44c0391e900ef20c4d0
 2014-06-30 22:14:05 +00:00
Winson Chung
31d66c60d8 Fixing another case where we weren't properly starting home when Recents is finished due to the screen powering off. 
- Reordering broadcast register/unregister to stop listening to the service when Recents is stopped
 2014-06-30 15:02:46 -07:00
ztenghui
c5c67f7592 Merge "Preparing the new GL depth test." 2014-06-30 17:43:33 +00:00
ztenghui
9e31cfa92c Merge "Use AnimatedVectorDrawable for progress bar." 2014-06-30 14:43:31 +00:00
Chet Haase
cef139470d Merge "Avoid null-deref crashes in ScrollBarDrawable" 2014-06-26 23:40:51 +00:00