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

156585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
87a529c899 am 12c84b5d: Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev 
* commit '12c84b5d9f30f3d31ab18fee719f3a1bf00ab957':
  Minor resource notation/compatibility fixes
 2014-10-17 19:21:43 +00:00
Adam Lesinski
12c84b5d9f Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev 2014-10-17 19:17:20 +00:00
Amith Yamasani
3e732ab205 am e1970346: am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev 
* commit 'e1970346a43109a9bcf4037135425a918fc953d3':
  Use the correct method to check if device is encrypted
 2014-10-17 19:14:06 +00:00
smain@google.com
d2d4fa78d3 am 43d7ad3e: am e62a4a50: am af8de90f: Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev 
* commit '43d7ad3e48e9323b3418c05170cbe4d1cff2b4a5':
  fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh.
 2014-10-17 19:14:01 +00:00
Quddus Chong
fb6436cb47 am fee0385f: am fdb2d1f8: am c598a4a4: Merge "docs: Fixed sound and vibration section in Android 5.0 API overview." into lmp-dev 
* commit 'fee0385f1c4af659b897ba2bfba7e4d9fa8f7ff1':
  docs: Fixed sound and vibration section in Android 5.0 API overview.
 2014-10-17 19:06:25 +00:00
Dianne Hackborn
9baa4506f1 am 3182987e: am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev 
* commit '3182987eb8bf93c77d2cde6d3483d39006aea28a':
  SDK only: hide the old L API version constant.
 2014-10-17 19:06:20 +00:00
Amith Yamasani
e1970346a4 am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev 
* commit 'b5afeca3d9ce3efb0ab9ab6536d4446ec73b416c':
  Use the correct method to check if device is encrypted
 2014-10-17 19:05:25 +00:00
smain@google.com
43d7ad3e48 am e62a4a50: am af8de90f: Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev 
* commit 'e62a4a50cf2cc4c26f8616d09bed30e94a7699ca':
  fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh.
 2014-10-17 19:05:21 +00:00
smain@google.com
c77dc6696f am 99c8167a: am a1012fb5: am fe511970: Merge "edits to the Lollipop highlights" into lmp-dev 
* commit '99c8167a1634a9347d08813190ac26bf7f05fb9b':
  edits to the Lollipop highlights
 2014-10-17 19:01:10 +00:00
Vince Harron
d6a34c55fc am cd5d6a68: am 9d141d1d: am 6da9e548: Merge "Updated Android SDK/Studio system requirements" into lmp-dev 
* commit 'cd5d6a6826e21f131a9715538d22a888b7cb61b0':
  Updated Android SDK/Studio system requirements
 2014-10-17 19:01:04 +00:00
Quddus Chong
9e868f0200 am 5fe3c49a: am 7f83b4a7: am 15d2e768: Merge "docs: Updated Android 5.0 API Overview to reflect that setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE causes the device to leave priority mode." into lmp-dev 
* commit '5fe3c49a62894f52f1e3b62027fba2a5a2270592':
  docs: Updated Android 5.0 API Overview to reflect that   setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE   causes the device to leave priority mode.
 2014-10-17 19:01:00 +00:00
Trevor Johns
dc62a2d6b1 am 8ac39738: am 6e028eba: am ac21dbb4: Docs: Update "What\'s New" for L Final Preview samples 
* commit '8ac3973862c87ecd166d4945878e5bffc9c25889':
  Docs: Update "What's New" for L Final Preview samples
 2014-10-17 19:00:55 +00:00
Jim Miller
0e5343833f am a6b7c5a7: am 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev 
* commit 'a6b7c5a7b11af0671cde1b20e4c76c9d16113ef8':
  Fix getStorageEncryptionStatus() in DevicePolicyManager
 2014-10-17 19:00:49 +00:00
Dirk Dougherty
e1fa68cd24 am 20a7afd4: am f0c1af8e: am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev 
* commit '20a7afd4b4fb0bc38ea3d4920f62e337c1011219':
  Doc change: Add Lollipop to platform versions table.
 2014-10-17 19:00:45 +00:00
smain@google.com
63294fe727 am 84b4ad4b: am 5957b633: am c8cef6cc: Merge "time to forget about honeycomb and gingerbread." into lmp-dev 
* commit '84b4ad4b20c8e9f2caab05df6716590c84dde595':
  time to forget about honeycomb and gingerbread.
 2014-10-17 19:00:40 +00:00
Amith Yamasani
b5afeca3d9 am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev 
* commit 'a865bb5df834194dee339db615c17d7c7b63aaa3':
  Use the correct method to check if device is encrypted
 2014-10-17 19:00:36 +00:00
smain@google.com
d11c89f7b1 am d8d62257: am 2ff9be11: am 8adb5fd1: Merge "fix links on preview page" into lmp-dev 
* commit 'd8d62257c3f7e2233792ce369e14de4214b7887b':
  fix links on preview page
 2014-10-17 19:00:35 +00:00
smain@google.com
f4c4b59314 am f51cc58c: am dfcdfbd6: am f19f6397: Merge "edits to the lollipop highlights" into lmp-dev 
* commit 'f51cc58c09efe79dd2152297f376c3dab0c321df':
  edits to the lollipop highlights
 2014-10-17 19:00:30 +00:00
Joe Fernandez
09e67c86b9 am 702cb3b2: am 7314b607: am e7cc9e80: Merge "docs: Android TV docs fixes for L SDK release" into lmp-dev 
* commit '702cb3b2f6b6d0eca9f8d40dc94142fcc6b53a35':
  docs: Android TV docs fixes for L SDK release
 2014-10-17 19:00:26 +00:00
smain@google.com
6ac0054500 am 0f6eb938: am d9b48e94: am 4561be01: Merge "add TV quality page to Develop landing carousel" into lmp-dev 
* commit '0f6eb938937996bcd6e3f889da5d03859df5f0e8':
  add TV quality page to Develop landing carousel
 2014-10-17 19:00:22 +00:00
Scott Rowe
81584ee6ed am 5100b72c: am fafb6c70: am dd886683: docs: Notifications changes for L 
* commit '5100b72cba49b0371ccead241e18420ebf8c3ee9':
  docs: Notifications changes for L
 2014-10-17 19:00:17 +00:00
Joe Fernandez
38748ce701 am 5f13e2f0: am f8d6891c: am 4deed3ec: Merge "docs: Android TV App Quality Requirements v2" into lmp-dev 
* commit '5f13e2f0fb56976351d0decb314a9cac85e8d1ba':
  docs: Android TV App Quality Requirements v2
 2014-10-17 19:00:12 +00:00
Scott Rowe
3d5d4b4cea am c371b0af: am 583cf69c: am 6bd081ca: docs: Displaying a Now Playing Card 
* commit 'c371b0afab75759a6c9bed9d0754aefe5cb4065b':
  docs: Displaying a Now Playing Card
 2014-10-17 19:00:08 +00:00
Joe Fernandez
d81ca1da05 am 39f69b79: am 770f57e0: am 321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev 
* commit '39f69b7984591b57d560ffb0c3e147121543b7fd':
  docs: Recents screen for tasks and activities
 2014-10-17 19:00:03 +00:00
smain@google.com
9c60193adf am 53805450: am 4a0f162d: am c6400892: Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev 
* commit '5380545023a7c7cbf690c732c3edab6d140d32fa':
  add Lollipop highlights and revision to 5.0 API overview intro
 2014-10-17 18:59:56 +00:00
Joe Fernandez
315a45e085 am 36d13e6a: am 491fa057: am d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev 
* commit '36d13e6ae8ccef31fde01118fd457f13f10d288f':
  Android 5.0 changes to IME switching
 2014-10-17 18:59:51 +00:00
Joe Fernandez
e9f6f29b66 am b07f08f1: am be097523: am c49acf02: Merge "docs: Update Android TV home for L announcement" into lmp-dev 
* commit 'b07f08f13751ae68e03501795d8f448c306a6180':
  docs:  Update Android TV home for L announcement
 2014-10-17 18:59:46 +00:00
David Friedman
3d8eb0a547 am 9ce4e565: am 4e5ebb99: am c2a556ff: Merge "Notificiations Design for Android L Release" into lmp-dev 
* commit '9ce4e565204c0d8828a05928be8f8177031dc52d':
  Notificiations Design for Android L Release
 2014-10-17 18:59:42 +00:00
David Friedman
5ac64f0d86 am 30be8be4: am 981c97ec: am 597d3861: Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev 
* commit '30be8be4d4fd42a245aa481d4abf3ae299e9e17e':
  NDK-r10c release notes (change log) for publication to NDK page on DAC.
 2014-10-17 18:59:37 +00:00
smain@google.com
9cdc6073e1 am fd756b9f: 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 'fd756b9ffdcd6a354878a885cce21c9ab2dfc7c4':
  update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement
 2014-10-17 18:59:32 +00:00
Ricardo Cervera
ce9676e712 am c1c31327: am f1425001: am 2e57c2c9: Merge "docs: Migrating material design info from the Preview site" into lmp-dev 
* commit 'c1c3132774a9a87e1a6dd625d6a284939652cc38':
  docs: Migrating material design info from the Preview site
 2014-10-17 18:59:22 +00:00
Quddus Chong
f8cdc97843 am b14e07e3: am 0fae717e: am 67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev 
* commit 'b14e07e34428e64d9a9525ea0322aa161b05efe6':
  docs: Updates to Android 5.0 API Overview.
 2014-10-17 18:59:16 +00:00
smain@google.com
e62a4a50cf am af8de90f: Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev 
* commit 'af8de90fd604d3a677947e72b0000bd1075c3665':
  fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh.
 2014-10-17 18:56:06 +00:00
Amith Yamasani
a865bb5df8 Merge "Use the correct method to check if device is encrypted" into lmp-dev 2014-10-17 18:55:58 +00:00
Quddus Chong
fee0385f1c am fdb2d1f8: am c598a4a4: Merge "docs: Fixed sound and vibration section in Android 5.0 API overview." into lmp-dev 
* commit 'fdb2d1f85c24bb72ca7e1150626d48a662324e63':
  docs: Fixed sound and vibration section in Android 5.0 API overview.
 2014-10-17 18:53:57 +00:00
Dianne Hackborn
3182987eb8 am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev 
* commit 'bab9b48efcc55ee247c428aa3f53725c25222166':
  SDK only: hide the old L API version constant.
 2014-10-17 18:53:37 +00:00
smain@google.com
99c8167a16 am a1012fb5: am fe511970: Merge "edits to the Lollipop highlights" into lmp-dev 
* commit 'a1012fb5ad6fa07fccf5b9c791bd77579720c857':
  edits to the Lollipop highlights
 2014-10-17 18:53:30 +00:00
Vince Harron
cd5d6a6826 am 9d141d1d: am 6da9e548: Merge "Updated Android SDK/Studio system requirements" into lmp-dev 
* commit '9d141d1d4c4fd33eb7013b2739bd2421620648ab':
  Updated Android SDK/Studio system requirements
 2014-10-17 18:53:22 +00:00
Quddus Chong
5fe3c49a62 am 7f83b4a7: am 15d2e768: Merge "docs: Updated Android 5.0 API Overview to reflect that setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE causes the device to leave priority mode." into lmp-dev 
* commit '7f83b4a7b037b9ccc93cda95a9855a976382907a':
  docs: Updated Android 5.0 API Overview to reflect that   setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE   causes the device to leave priority mode.
 2014-10-17 18:53:18 +00:00
Trevor Johns
8ac3973862 am 6e028eba: am ac21dbb4: Docs: Update "What\'s New" for L Final Preview samples 
* commit '6e028eba502e86e16dbb5182cb8f5e0697dc43cf':
  Docs: Update "What's New" for L Final Preview samples
 2014-10-17 18:53:14 +00:00
Jim Miller
a6b7c5a7b1 am 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev 
* commit '4142d9b01d6485afddf7567f1da9959361d6a687':
  Fix getStorageEncryptionStatus() in DevicePolicyManager
 2014-10-17 18:53:01 +00:00
Dirk Dougherty
20a7afd4b4 am f0c1af8e: am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev 
* commit 'f0c1af8e4b00a973914a1a3fe22f6d0f98fb704f':
  Doc change: Add Lollipop to platform versions table.
 2014-10-17 18:52:57 +00:00
smain@google.com
84b4ad4b20 am 5957b633: am c8cef6cc: Merge "time to forget about honeycomb and gingerbread." into lmp-dev 
* commit '5957b6339621d1c84669581bf6a9f68f3d9fbd95':
  time to forget about honeycomb and gingerbread.
 2014-10-17 18:52:54 +00:00
smain@google.com
d8d62257c3 am 2ff9be11: am 8adb5fd1: Merge "fix links on preview page" into lmp-dev 
* commit '2ff9be116ff6e6ffea33cfae21921d34d66b7f72':
  fix links on preview page
 2014-10-17 18:52:50 +00:00
smain@google.com
f51cc58c09 am dfcdfbd6: am f19f6397: Merge "edits to the lollipop highlights" into lmp-dev 
* commit 'dfcdfbd64acc4d2135b28eb3d61d2a174748e55d':
  edits to the lollipop highlights
 2014-10-17 18:52:46 +00:00
Joe Fernandez
702cb3b2f6 am 7314b607: am e7cc9e80: Merge "docs: Android TV docs fixes for L SDK release" into lmp-dev 
* commit '7314b6076ecef1b79f205016544268ffd38112f3':
  docs: Android TV docs fixes for L SDK release
 2014-10-17 18:52:42 +00:00
smain@google.com
0f6eb93893 am d9b48e94: am 4561be01: Merge "add TV quality page to Develop landing carousel" into lmp-dev 
* commit 'd9b48e94a139e11924527f16f66ff0491a4502d8':
  add TV quality page to Develop landing carousel
 2014-10-17 18:52:21 +00:00
Scott Rowe
5100b72cba am fafb6c70: am dd886683: docs: Notifications changes for L 
* commit 'fafb6c708096d809ce6b8b57ac8c2293698cdf6a':
  docs: Notifications changes for L
 2014-10-17 18:52:17 +00:00
Joe Fernandez
5f13e2f0fb am f8d6891c: am 4deed3ec: Merge "docs: Android TV App Quality Requirements v2" into lmp-dev 
* commit 'f8d6891c69d9ef716f1e7f4df206522cf6356e00':
  docs: Android TV App Quality Requirements v2
 2014-10-17 18:52:13 +00:00
Scott Rowe
c371b0afab am 583cf69c: am 6bd081ca: docs: Displaying a Now Playing Card 
* commit '583cf69c00326a1d67d5ca8c8a0d9597ec50aa93':
  docs: Displaying a Now Playing Card
 2014-10-17 18:52:08 +00:00