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

158620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
f85be7172b am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev 
* commit '7d96dc6d98774ff9b7cf1370f9a5508c4eac6a85':
  Fix getStorageEncryptionStatus() in DevicePolicyManager
 2014-10-17 09:35:06 +00:00
Jim Miller
7d96dc6d98 Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev 2014-10-17 09:31:04 +00:00
Dirk Dougherty
eab518b443 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:24:36 +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
4943d37ea5 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:41 +00:00
smain@google.com
e1d6e05c31 am 8adb5fd1: Merge "fix links on preview page" into lmp-dev 
* commit '8adb5fd14dae51faeb5b85b8cbcfc0930094e73f':
  fix links on preview page
 2014-10-17 09:15:37 +00:00
Dan Albert
3f12158f0b am b9734228: (-s ours) am 69c8d39d: Merge "Clean up unused parameter warnings." 
* commit 'b9734228046d541539ae7ce4f5ba22b9e2153e77':
  Clean up unused parameter warnings.
 2014-10-17 09:02:25 +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
fa4c1ce1cc Merge "edits to the lollipop highlights" into lmp-dev 
automerge: f19f639

* commit 'f19f639773e64289ed7345b8a1ea4dd244aa4882':
  edits to the lollipop highlights
 2014-10-17 08:33:01 +00: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
4ed4a86d6d 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:50:30 +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
b64d987ef3 Merge "add TV quality page to Develop landing carousel" into lmp-dev 
automerge: 4561be0

* commit '4561be01934cdc462570b56afb4c602cbf3295c4':
  add TV quality page to Develop landing carousel
 2014-10-17 07:10:17 +00:00
Scott Rowe
1d90cac982 docs: Notifications changes for L 
automerge: dd88668

* commit 'dd88668392839509c812a544b1132185b3825b69':
  docs: Notifications changes for L
 2014-10-17 07:09:17 +00:00
Joe Fernandez
08efa1ddd4 Merge "docs: Android TV App Quality Requirements v2" into lmp-dev 
automerge: 4deed3e

* commit '4deed3ecc3b47d520ca6084f2fa6ad7a9dc8c018':
  docs: Android TV App Quality Requirements v2
 2014-10-17 07:08:22 +00:00
smain@google.com
4561be0193 Merge "add TV quality page to Develop landing carousel" into lmp-dev 2014-10-17 06:51:43 +00:00
Scott Rowe
dd88668392 docs: Notifications changes for L 
Change-Id: I53c744734358401adefbcffd5ce5a3676d6d955a
 2014-10-16 23:48:25 -07:00
Scott Rowe
9b66fc5f41 docs: Displaying a Now Playing Card 
automerge: 6bd081c

* commit '6bd081ca8a555fd71fbe856374b8efe68ede6144':
  docs: Displaying a Now Playing Card
 2014-10-17 06:40:37 +00:00
Joe Fernandez
4deed3ecc3 Merge "docs: Android TV App Quality Requirements v2" into lmp-dev 2014-10-17 06:38:37 +00:00
Joe Fernandez
957cddd71b docs: Android TV App Quality Requirements v2 
Change-Id: I54c53d90faf1605945bb8397278b9057a9c687f4
 2014-10-16 23:31:08 -07:00
Scott Rowe
6bd081ca8a docs: Displaying a Now Playing Card 
Change-Id: I68cd305618caff24cf2de564d7b085c663702d0c
 2014-10-16 23:29:51 -07:00
smain@google.com
e1c95081b4 add TV quality page to Develop landing carousel 
Change-Id: I736654e248645bfda7f94156b8c0f520a8be4bac
 2014-10-16 23:22:50 -07:00
Joe Fernandez
06d2cb68b4 Merge "docs: Recents screen for tasks and activities" into lmp-dev 
automerge: 321e764

* commit '321e7645c305dbc4f7444d364c879bad8946da2b':
  docs: Recents screen for tasks and activities
 2014-10-17 05:49:27 +00:00
Joe Fernandez
321e7645c3 Merge "docs: Recents screen for tasks and activities" into lmp-dev 2014-10-17 05:40:43 +00:00
smain@google.com
7feac6013b Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev 
automerge: c640089

* commit 'c6400892b56ee217ed01a41abb769fb1aebc9830':
  add Lollipop highlights and revision to 5.0 API overview intro
 2014-10-17 05:33:46 +00:00
Joe Fernandez
365ca55529 Merge "Android 5.0 changes to IME switching" into lmp-dev 
automerge: d664dc9

* commit 'd664dc93f47e32df865384718055b200585e0e88':
  Android 5.0 changes to IME switching
 2014-10-17 05:33:00 +00:00
smain@google.com
c6400892b5 Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev 2014-10-17 05:17:02 +00:00
Scott Rowe
73d799dda2 docs: Recents screen for tasks and activities 
Change-Id: I94774e60e6a7453a047ad394c3bbfff0cc4dfc7d
 2014-10-16 22:16:13 -07:00
smain@google.com
4c169e03fb add Lollipop highlights and revision to 5.0 API overview intro 
Change-Id: Ic50db6ea2ea9893088f271ce2427ccda69fc6b75
 2014-10-16 22:15:18 -07:00
Joe Fernandez
b76c0d5853 Merge "docs: Update Android TV home for L announcement" into lmp-dev 
automerge: c49acf0

* commit 'c49acf029e65928d07815631a0160fe179458add':
  docs:  Update Android TV home for L announcement
 2014-10-17 05:04:44 +00:00
David Friedman
bf8860cd0e Merge "Notificiations Design for Android L Release" into lmp-dev 
automerge: c2a556f

* commit 'c2a556ffe8a5949a0e3d7baf8122ea38b4ae1d30':
  Notificiations Design for Android L Release
 2014-10-17 05:03:52 +00:00
David Friedman
5121f214f0 Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev 
automerge: 597d386

* commit '597d3861298d8c3e2bc50c92ecffb4003cd265f7':
  NDK-r10c release notes (change log) for publication to NDK page on DAC.
 2014-10-17 05:03:06 +00:00
Joe Fernandez
d664dc93f4 Merge "Android 5.0 changes to IME switching" into lmp-dev 2014-10-17 05:01:04 +00:00
Joe Fernandez
c49acf029e Merge "docs: Update Android TV home for L announcement" into lmp-dev 2014-10-17 04:58:03 +00:00
David Friedman
e802d5432e Android 5.0 changes to IME switching 
Change-Id: I158736ee36706889a5277f02a652162194289514
 2014-10-16 21:52:53 -07:00
David Friedman
c2a556ffe8 Merge "Notificiations Design for Android L Release" into lmp-dev 2014-10-17 04:48:32 +00:00
David Friedman
0df77e988a Notificiations Design for Android L Release 
Change-Id: I32723dafa2d3bd455da9c6e03c09c668b2bd6446
 2014-10-16 21:39:25 -07:00
Joe Fernandez
d5c4c26869 docs: Update Android TV home for L announcement 
Change-Id: Ie98da5efa59dd3c797dda38bb465b7cc66b4d2e7
 2014-10-16 21:38:17 -07:00
David Friedman
597d386129 Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev 2014-10-17 04:30:29 +00:00
David Friedman
2fe086c21f NDK-r10c release notes (change log) for publication to NDK page on DAC. 
Change-Id: I0f8bc87b741ec1ef978c3fc22954d43519172299
 2014-10-16 21:18:03 -07:00
smain@google.com
9f39335194 update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement 
automerge: 271078f

* commit '271078f50dc730e0fda8e80c66b81ac2442f64f0':
  update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement
 2014-10-17 02:12:42 +00:00
Ricardo Cervera
b7f8947f04 Merge "docs: Migrating material design info from the Preview site" into lmp-dev 
automerge: 2e57c2c

* commit '2e57c2c956588b3f08111c323e811d4cbe46dabd':
  docs: Migrating material design info from the Preview site
 2014-10-17 02:11:44 +00:00
smain@google.com
271078f50d update L preview landing page for 5.0 SDK launch 
includes new system images
also update the DAC homepage announcement

Change-Id: I6e249e4ec5ef4b4329b145b334b31cfe11dd136c
 2014-10-16 18:48:17 -07:00