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

140971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
39f09e23d4 Don't throw exception for root scene transitions. 
Bug 13745751

Change-Id: I7bb3cbabf4f402b38f5aa57ad0ee3b4320fa83cc
 2014-06-30 23:16:30 +00:00
Alan Viverette
d87c7767d9 Merge "Fix NPE in AbsListView hotspot management" 2014-06-30 22:33:05 +00:00
Alan Viverette
8390fab6f4 Fix NPE in AbsListView hotspot management 
BUG: 15989761
Change-Id: I1c2fc2ddf3128bf3ba4aa7d986899193559b0c76
 2014-06-30 16:03:43 -07:00
Amit Mahajan
2baabeaf69 Merge "EAP-SIM RIL command name change." 2014-06-30 22:24:07 +00:00
Amit Mahajan
d518376874 EAP-SIM RIL command name change. 
Modified the name to match what was in QCRIL.

Change-Id: I41abfacb7bacd4cfa0d4543100ac9960c97184f9
 2014-06-30 22:59:07 +00:00
Alan Viverette
20312a4825 Merge "Fix Material-themed alert dialog sizing" 2014-06-30 22:27:39 +00:00
Alan Viverette
f56ed2db00 Fix Material-themed alert dialog sizing 
Also cleans up line width and final usage in AlertController.

BUG: 14904438
Change-Id: Idffa7a1c6edcf4a709ff6322d4bf95ce22d281ea
 2014-06-30 15:57:44 -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
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
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
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
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
b4dabadd89 Preparing the new GL depth test. 
Right now, the code is just copied from ApiDemos for the initial setup.

Change-Id: I531f95faca744c7e91fadae189818af3d04a85ee
 2014-06-30 13:11:40 -07:00
ztenghui
9cb5b4c2d9 Use AnimatedVectorDrawable for progress bar. 
Change-Id: I419197ef38a611757f27ca3192350ad4bd403875
 2014-06-30 12:43:52 -07:00
ztenghui
9e31cfa92c Merge "Use AnimatedVectorDrawable for progress bar." 2014-06-30 14:43:31 +00:00