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

163361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
5380545023 am 4a0f162d: am c6400892: Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev 
* commit '4a0f162df7ca0079b25b61cd4734340cbe5de7f4':
  add Lollipop highlights and revision to 5.0 API overview intro
 2014-10-17 18:52:00 +00:00
Joe Fernandez
36d13e6ae8 am 491fa057: am d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev 
* commit '491fa0570def75b1e056dc1c0954f07d2b524a7f':
  Android 5.0 changes to IME switching
 2014-10-17 18:51:56 +00:00
Joe Fernandez
b07f08f137 am be097523: am c49acf02: Merge "docs: Update Android TV home for L announcement" into lmp-dev 
* commit 'be097523180eab10ec3dec73ec4cc2b7056fed6e':
  docs:  Update Android TV home for L announcement
 2014-10-17 18:51:52 +00:00
David Friedman
9ce4e56520 am 4e5ebb99: am c2a556ff: Merge "Notificiations Design for Android L Release" into lmp-dev 
* commit '4e5ebb994a7d96c86f598c499956f04a1256e6a7':
  Notificiations Design for Android L Release
 2014-10-17 18:51:47 +00:00
David Friedman
30be8be4d4 am 981c97ec: am 597d3861: Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev 
* commit '981c97ecc0347b2647682a54556d06f2e52ad16a':
  NDK-r10c release notes (change log) for publication to NDK page on DAC.
 2014-10-17 18:51:43 +00:00
smain@google.com
fd756b9ffd am 238b4795: am 271078f5: update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement 
* commit '238b4795468bf8ab93ab7c50b9855e8e84d2f49d':
  update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement
 2014-10-17 18:51:39 +00:00
Ricardo Cervera
c1c3132774 am f1425001: am 2e57c2c9: Merge "docs: Migrating material design info from the Preview site" into lmp-dev 
* commit 'f14250014b11fd61dec427dd0813fbb43d2fe3ff':
  docs: Migrating material design info from the Preview site
 2014-10-17 18:51:23 +00:00
Quddus Chong
b14e07e344 am 0fae717e: am 67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev 
* commit '0fae717e207d18a36148c7ddb4a203d4f7447bf7':
  docs: Updates to Android 5.0 API Overview.
 2014-10-17 18:51:18 +00:00
Alan Viverette
15d3a53be5 am 721fc2ad: Fix build 
* commit '721fc2adf4d4d5b890b12cb2067db10e78888aba':
  Fix build
 2014-10-17 18:50:41 +00:00
Alan Viverette
721fc2adf4 Fix build 
Change-Id: Idd7ae84c0d128bd40f0e7a83882e4ed4181e8a4d
 2014-10-17 11:36:38 -07:00
Alan Viverette
ef8a19147e am 0087f225: am 2f68a204: Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev 
* commit '0087f2253ac8cbb4868fd27d71afbad32a103a75':
  Check type resolution on declared methods and fields in ViewDebug
 2014-10-17 17:27:41 +00:00
Alan Viverette
0087f2253a am 2f68a204: Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev 
* commit '2f68a204b2299029dd492ab25bd3bcfe7216bafc':
  Check type resolution on declared methods and fields in ViewDebug
 2014-10-17 17:23:20 +00:00
Dianne Hackborn
aa02bce2f4 am 56ae0447: am 686a41ef: Merge "Add API level for MR1." into lmp-mr1-dev 
* commit '56ae044791aa9a800292eb0f6c3852ede91f17c2':
  Add API level for MR1.
 2014-10-17 17:19:55 +00:00
Alan Viverette
2f68a204b2 Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev 2014-10-17 17:18:36 +00:00
Dianne Hackborn
56ae044791 am 686a41ef: Merge "Add API level for MR1." into lmp-mr1-dev 
* commit '686a41ef2b05b3fb1c5c5f44ec6270ab317ce9d5':
  Add API level for MR1.
 2014-10-17 17:15:29 +00:00
Dianne Hackborn
686a41ef2b Merge "Add API level for MR1." into lmp-mr1-dev 2014-10-17 17:12:01 +00:00
John Spurlock
c64630d013 am cd9ec79b: am 6daac003: Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev 
* commit 'cd9ec79b10d335e964ce4a43be4ea962bbe171bf':
  PowerUI: Uncategorize battery notifications as _SYSTEM.
 2014-10-17 16:49:27 +00:00
John Spurlock
cd9ec79b10 am 6daac003: Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev 
* commit '6daac00331fa79d8ab249ef148a8116e58ca9a56':
  PowerUI: Uncategorize battery notifications as _SYSTEM.
 2014-10-17 16:43:42 +00:00
John Spurlock
6daac00331 Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev 2014-10-17 16:39:21 +00:00
John Spurlock
3cf316f71d am 0f0ee577: am 289d797a: QS: 7 day timeout for color-inversion tile. 
* commit '0f0ee577f64d7fed31ba2688fb58f607abc22a39':
  QS: 7 day timeout for color-inversion tile.
 2014-10-17 16:25:48 +00:00
John Spurlock
0f0ee577f6 am 289d797a: QS: 7 day timeout for color-inversion tile. 
* commit '289d797a6a748cfc7dcca8c815fab6c37061bf05':
  QS: 7 day timeout for color-inversion tile.
 2014-10-17 16:20:48 +00:00
John Spurlock
5b038b4b2b PowerUI: Uncategorize battery notifications as _SYSTEM. 
So they don't interrupt in priority mode.

Bug: 17691121
Change-Id: I51757c0275ec461a786d1e254b0e71f7b27b5029
 2014-10-17 12:16:57 -04:00
John Spurlock
289d797a6a QS: 7 day timeout for color-inversion tile. 
Bug: 17631628
Change-Id: I4f8a6ce3ea1f79d696686760732c3e8216bfb6c4
 2014-10-17 12:06:38 -04:00
Neil Fuller
3b96bfb103 am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references" 
* commit '9b0109eb051fcf0a7ad801d03e73aa4e0bf2d7a7':
  Removing some more FloatMath references
 2014-10-17 14:59:48 +00:00
Neil Fuller
9b0109eb05 am c7aa8fe6: Merge "Removing some more FloatMath references" 
* commit 'c7aa8fe62356fc09962941140c8bb7ed8bab2f8f':
  Removing some more FloatMath references
 2014-10-17 14:54:17 +00:00
Neil Fuller
c7aa8fe623 Merge "Removing some more FloatMath references" 2014-10-17 14:48:17 +00:00
Jim Miller
4142d9b01d am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev 
* commit '7d96dc6d98774ff9b7cf1370f9a5508c4eac6a85':
  Fix getStorageEncryptionStatus() in DevicePolicyManager
 2014-10-17 09:34:37 +00:00
Jim Miller
7d96dc6d98 Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev 2014-10-17 09:31:04 +00:00
Dirk Dougherty
f0c1af8e4b am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev 
* commit '22fa76dac8de6cfd9e7bc1eb8800f4cddbfc0640':
  Doc change: Add Lollipop to platform versions table.
 2014-10-17 09:25:33 +00:00
Dirk Dougherty
22fa76dac8 Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev 2014-10-17 09:21:29 +00:00
Dirk Dougherty
2b86948e46 Doc change: Add Lollipop to platform versions table. 
Change-Id: Iad84444396a3b2d24403e88398ca21933741b819
 2014-10-17 02:16:58 -07:00
smain@google.com
5957b63396 am c8cef6cc: Merge "time to forget about honeycomb and gingerbread." into lmp-dev 
* commit 'c8cef6ccbb470b66b99ec9286728bc875ead6ce7':
  time to forget about honeycomb and gingerbread.
 2014-10-17 09:15:23 +00:00
smain@google.com
2ff9be116f am 8adb5fd1: Merge "fix links on preview page" into lmp-dev 
* commit '8adb5fd14dae51faeb5b85b8cbcfc0930094e73f':
  fix links on preview page
 2014-10-17 09:15:20 +00:00
smain@google.com
dfcdfbd64a am f19f6397: Merge "edits to the lollipop highlights" into lmp-dev 
* commit 'f19f639773e64289ed7345b8a1ea4dd244aa4882':
  edits to the lollipop highlights
 2014-10-17 09:15:17 +00:00
Dan Albert
59df570abf am b9734228: (-s ours) am 69c8d39d: Merge "Clean up unused parameter warnings." 
* commit 'b9734228046d541539ae7ce4f5ba22b9e2153e77':
  Clean up unused parameter warnings.
 2014-10-17 09:02:54 +00:00
smain@google.com
c8cef6ccbb Merge "time to forget about honeycomb and gingerbread." into lmp-dev 2014-10-17 08:37:16 +00:00
smain@google.com
ae8355247a time to forget about honeycomb and gingerbread. 
Change-Id: I74a1a62109f28b6ed08acee4761e25bfe8278257
 2014-10-17 01:35:12 -07:00
smain@google.com
8adb5fd14d Merge "fix links on preview page" into lmp-dev 2014-10-17 08:32:20 +00:00
smain@google.com
f7a7d6de7a fix links on preview page 
Change-Id: If2c3380dcb3ecc2770ba84fd6599ba69ea0a33f2
 2014-10-17 01:31:24 -07:00
smain@google.com
f19f639773 Merge "edits to the lollipop highlights" into lmp-dev 2014-10-17 08:18:47 +00:00
smain@google.com
1b41dbf4fa edits to the lollipop highlights 
Change-Id: I7efaae064780c3f778f25d11e9378852c11eb5eb
 2014-10-17 01:16:58 -07:00
Joe Fernandez
7314b6076e am e7cc9e80: Merge "docs: Android TV docs fixes for L SDK release" into lmp-dev 
* commit 'e7cc9e8089db48fd0d3d61e0494b2567d87dd711':
  docs: Android TV docs fixes for L SDK release
 2014-10-17 07:47:00 +00:00
Joe Fernandez
e7cc9e8089 Merge "docs: Android TV docs fixes for L SDK release" into lmp-dev 2014-10-17 07:43:02 +00:00
Dan Albert
b973422804 am 69c8d39d: Merge "Clean up unused parameter warnings." 
* commit '69c8d39d1f9ebb55844ad7794d12fedf8b5be5bf':
  Clean up unused parameter warnings.
 2014-10-17 07:38:20 +00:00
Joe Fernandez
7213656f98 docs: Android TV docs fixes for L SDK release 
Change-Id: Ie37c2056844e1c04542ed4e556a6577640e13819
 2014-10-17 00:35:50 -07:00
smain@google.com
d9b48e94a1 am 4561be01: Merge "add TV quality page to Develop landing carousel" into lmp-dev 
* commit '4561be01934cdc462570b56afb4c602cbf3295c4':
  add TV quality page to Develop landing carousel
 2014-10-17 07:29:26 +00:00
Scott Rowe
fafb6c7080 am dd886683: docs: Notifications changes for L 
* commit 'dd88668392839509c812a544b1132185b3825b69':
  docs: Notifications changes for L
 2014-10-17 07:29:22 +00:00
Joe Fernandez
f8d6891c69 am 4deed3ec: Merge "docs: Android TV App Quality Requirements v2" into lmp-dev 
* commit '4deed3ecc3b47d520ca6084f2fa6ad7a9dc8c018':
  docs: Android TV App Quality Requirements v2
 2014-10-17 07:29:19 +00:00
Scott Rowe
583cf69c00 am 6bd081ca: docs: Displaying a Now Playing Card 
* commit '6bd081ca8a555fd71fbe856374b8efe68ede6144':
  docs: Displaying a Now Playing Card
 2014-10-17 07:29:15 +00:00
Joe Fernandez
770f57e068 am 321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev 
* commit '321e7645c305dbc4f7444d364c879bad8946da2b':
  docs: Recents screen for tasks and activities
 2014-10-17 07:29:12 +00:00