Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,413 Commits 3 Branches 0 Tags
44d515457a55cdcd92257a711db8dd10f71f0175
Commit Graph

155413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Bourke
44d515457a am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev 
* commit '7d5c68e31eea3848fd8fa75dfd9f7190ef1cd3a3':
  Modified lollipop Easter egg for TV compatibility
 2014-10-17 22:09:19 +00:00
Joe Fernandez
f617da039d am 2cc44f2a: am 6dc5d683: docs: Android L release fixes 
* commit '2cc44f2adce51bbc7df4b96d12287628b8f903b3':
  docs: Android L release fixes
 2014-10-17 22:09:15 +00:00
William Bourke
7d5c68e31e am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev 
* commit '84b4791aaf0384a334068a97c70fcda162cfadab':
  Modified lollipop Easter egg for TV compatibility
 2014-10-17 22:03:50 +00:00
Joe Fernandez
2cc44f2adc am 6dc5d683: docs: Android L release fixes 
* commit '6dc5d68399377eb8d6a3132c2af475d92ed8aca5':
  docs: Android L release fixes
 2014-10-17 22:03:47 +00:00
William Bourke
84b4791aaf Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev 2014-10-17 22:01:00 +00:00
Joe Fernandez
6dc5d68399 docs: Android L release fixes 
- L Highlights fixes
b/18029526
- L API Overview fixes
b/18034482

Change-Id: I2e93ece18748c15a8fe10749e75008bf5ed9a7c0
 2014-10-17 14:57:29 -07:00
William Bourke
33f577cfea Modified lollipop Easter egg for TV compatibility 
Bug: 17997922

Change-Id: I0e2e34245183cdd146ecca02ab09b2c4867770ec
 2014-10-17 21:57:23 +00:00
Joe Fernandez
1f5d55d135 am 1fede10c: am 09cce6f5: Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev 
* commit '1fede10c269f97f2a9dac48025dccce7e45cef9d':
  docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result
 2014-10-17 21:51:51 +00:00
Joe Fernandez
1fede10c26 am 09cce6f5: Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev 
* commit '09cce6f509af58e3eeaf687b63e292c222a7d769':
  docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result
 2014-10-17 21:46:10 +00:00
Joe Fernandez
09cce6f509 Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev 2014-10-17 21:39:27 +00:00
Andrew Solovay
1c56c15d4d docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result 
See first comment for doc staging directory.

bug: 18000631
Change-Id: I4dba47e0965947774adad86218369678311f4a0c
 2014-10-17 14:05:22 -07:00
Joe Fernandez
9881c0d8f4 am c97bc213: am f21746fc: Merge "docs: update location of sample apps" into lmp-dev 
* commit 'c97bc213481cef235b10a2d4d17caba7301cd3c5':
  docs: update location of sample apps
 2014-10-17 20:01:04 +00:00
Joe Fernandez
c97bc21348 am f21746fc: Merge "docs: update location of sample apps" into lmp-dev 
* commit 'f21746fca8603ed5a4d328b804ad6de24226ef49':
  docs: update location of sample apps
 2014-10-17 19:52:07 +00:00
Joe Fernandez
f21746fca8 Merge "docs: update location of sample apps" into lmp-dev 2014-10-17 19:39:28 +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
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
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
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
Joe Fernandez
39f69b7984 am 770f57e0: am 321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev 
* commit '770f57e06837c8d2b7e42776b569b568d2360057':
  docs: Recents screen for tasks and activities
 2014-10-17 18:52:04 +00:00
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
smain@google.com
af8de90fd6 Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev 2014-10-17 18:47:12 +00:00
smain@google.com
3552be039a fix 1% mystery bug on preview image downloads. 
just remove the hashchange listener; no more back-navigation, eh.

Change-Id: I6c822336f33448d9ce01e710fbea2ab134fb8718
 2014-10-17 11:45:33 -07:00
Amith Yamasani
cd410ba4e8 Use the correct method to check if device is encrypted 
DPM's method will return false if encrypted by default password,
preventing the changing of encryption password to lockscreen password.

Check if the device is encrypted by some means, instead.

Also fix a SecurityException when Device Admin queries encryption state
(recent regression)

Bug: 17881324
Change-Id: Id897e61c5e254ab3f8dc569285428a73005303ea
 2014-10-17 11:43:57 -07:00
Quddus Chong
fdb2d1f85c am c598a4a4: Merge "docs: Fixed sound and vibration section in Android 5.0 API overview." into lmp-dev 
* commit 'c598a4a4d5739dbdac7674d86125a347696937f6':
  docs: Fixed sound and vibration section in Android 5.0 API overview.
 2014-10-17 18:37:29 +00:00
Alan Viverette
721fc2adf4 Fix build 
Change-Id: Idd7ae84c0d128bd40f0e7a83882e4ed4181e8a4d
 2014-10-17 11:36:38 -07:00