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

158730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prem Kumar
7666c912b8 Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev 2014-10-18 19:51:53 +00:00
Alan Viverette
6fffe58bf4 am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev 
* commit '15e7b2ac60b0e6355e6ed5c1be676744c23f5a0e':
  Translate compound button drawable by scroll position
 2014-10-18 00:26:00 +00:00
Alan Viverette
15e7b2ac60 Merge "Translate compound button drawable by scroll position" into lmp-dev 2014-10-18 00:20:27 +00:00
Alan Viverette
b95c336d78 Translate compound button drawable by scroll position 
BUG: 18028674
Change-Id: Iaba848642b87f0d134c6a6c57e5756d883e45904
 2014-10-17 17:19:12 -07:00
Kristian Monsen
a15a75f32d am 5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev 
* commit '5d6041813283086c5a290ad6ca07e05b1a6ffc14':
  Let TYPE_ANNOUNCEMENT be sent from any window
 2014-10-17 23:56:57 +00:00
Kristian Monsen
5d60418132 Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev 2014-10-17 23:54:01 +00:00
Jim Miller
527664c88c am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 
* commit 'c6c843fbe8fb8d9bdd012a472e22970ee89b9d24':
  Add utility methods to LockPatternUtils for encryption
 2014-10-17 23:52:44 +00:00
Jim Miller
c6c843fbe8 Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 2014-10-17 23:48:21 +00:00
Yorke Lee
550279702e am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev 
* commit 'e4e3fcec415cdc9739f32ce1eaaec67666e5454d':
  Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions
 2014-10-17 23:20:26 +00:00
Yorke Lee
e4e3fcec41 Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev 2014-10-17 23:16:35 +00:00
Jim Miller
dd5de719c5 Add utility methods to LockPatternUtils for encryption 
This enables a change in Settings that allows device
encryption to be disabled by the user.

Fixes bug 17881324

Change-Id: I34dfc586df1a598bf969dc82adf8537a2730d345
 2014-10-17 16:08:21 -07:00
Svetoslav
5ee758932a am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev 
* commit 'cd2b54e6e546099e028f9e41966ab7cf1deedd3c':
  Accessibility no longer overrides strong encryption.
 2014-10-17 23:04:13 +00:00
Svetoslav
cd2b54e6e5 Merge "Accessibility no longer overrides strong encryption." into lmp-dev 2014-10-17 22:59:22 +00:00
Adam Lesinski
18d5d1107d am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev 
* commit '3cd840f4b5a2988700a6b366fa32f4565c319900':
  AAPT: Fix an issue where a resource name was incorrectly derived on Windows
 2014-10-17 22:55:25 +00:00
Adam Lesinski
3cd840f4b5 Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev 2014-10-17 22:50:50 +00:00
William Bourke
e4444d0fd6 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:04:44 +00:00
Joe Fernandez
68ab51bd0c am 6dc5d683: docs: Android L release fixes 
* commit '6dc5d68399377eb8d6a3132c2af475d92ed8aca5':
  docs: Android L release fixes
 2014-10-17 22:04:38 +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
Adam Lesinski
9306a474e1 AAPT: Fix an issue where a resource name was incorrectly derived on Windows 
Calling String8::getLeaf() will assume the system's file path separator,
however the source string was already converted to a unix path.
getLeaf() would therefore not find any occurence of '\' and would
return the full path.

Bug:18036805
Change-Id: Ic2bfac0cc553406740204a296327e266b05c0eff
 2014-10-17 21:46:52 +00:00
Joe Fernandez
d1c3c83dc3 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:44:39 +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
Svetoslav
a6711ff6f0 Accessibility no longer overrides strong encryption. 
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.

bug:17881324

Change-Id: Ic60d760c267d3f934040a42e1963b179bd8b9f5f
 2014-10-17 14:33:11 -07:00
Kristian Monsen
ba3787d849 Let TYPE_ANNOUNCEMENT be sent from any window 
Part of fix for bug 17905712

Change-Id: I4e4b09f6b6342a27744e42984d483ef8de18fbff
 2014-10-17 14:13:07 -07: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
5259fee88e am f21746fc: Merge "docs: update location of sample apps" into lmp-dev 
* commit 'f21746fca8603ed5a4d328b804ad6de24226ef49':
  docs: update location of sample apps
 2014-10-17 19:44:38 +00:00
Joe Fernandez
f21746fca8 Merge "docs: update location of sample apps" into lmp-dev 2014-10-17 19:39:28 +00:00
Amith Yamasani
3de84d0de6 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 18:58:58 +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
smain@google.com
70d0ca89d1 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:52:28 +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
f039ad9023 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:06 +00:00
Quddus Chong
c598a4a4d5 Merge "docs: Fixed sound and vibration section in Android 5.0 API overview." into lmp-dev 2014-10-17 18:32:02 +00:00
Jorim Jaggi
89f7f281e3 Always execute resumeAppSwitches when launching something 
Bug: 18024449
Change-Id: Ib5ea92d141d74676d00fd3118930bdb0ef5b2935
 2014-10-17 19:57:38 +02:00
Scott Rowe
87b1d0d099 docs: update location of sample apps 
Change-Id: I5079d5578c29cde387d087ec8767ae03aaa7ebe2
 2014-10-17 10:46:04 -07:00
Yorke Lee
65d241b92d Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions 
Bug: 18020724
Change-Id: I5a0e5ef8a1e40ee23f4b132f5877b63a738e776e
 2014-10-17 10:23:37 -07:00
Quddus Chong
7b4e310de9 docs: Fixed sound and vibration section in Android 5.0 API overview. 
Change-Id: Icb5379cb1c390c011c9ca8c1d585ebcaea8f92dc
 2014-10-17 10:17:55 -07:00
Dianne Hackborn
53cf2d4b9f am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev 
* commit '52476989b8afc0e96c2218625031ed550b12c79b':
  SDK only: hide the old L API version constant.
 2014-10-17 17:15:02 +00:00
Dianne Hackborn
52476989b8 Merge "SDK only: hide the old L API version constant." into lmp-dev 2014-10-17 17:11:24 +00:00
smain@google.com
1cdd6c2075 am fe511970: Merge "edits to the Lollipop highlights" into lmp-dev 
* commit 'fe51197084ab70ea48a9ddf13ecc0d0afe81d0ea':
  edits to the Lollipop highlights
 2014-10-17 16:51:48 +00:00
smain@google.com
fe51197084 Merge "edits to the Lollipop highlights" into lmp-dev 2014-10-17 16:47:33 +00:00
smain@google.com
519ea74a47 edits to the Lollipop highlights 
Change-Id: I1702946aca8c30528488465be422a9b68a9ae049
 2014-10-17 09:40:49 -07:00
Vince Harron
13c77eeb27 am 6da9e548: Merge "Updated Android SDK/Studio system requirements" into lmp-dev 
* commit '6da9e5481aa78fa3541f0546f237049f9d8e3b81':
  Updated Android SDK/Studio system requirements
 2014-10-17 16:15:28 +00:00
Vince Harron
6da9e5481a Merge "Updated Android SDK/Studio system requirements" into lmp-dev 2014-10-17 16:12:06 +00:00
Quddus Chong
5fb5179a75 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 '15d2e768d67b23fc374895dac8024d40598ffc72':
  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 16:09:50 +00:00
Trevor Johns
ab0b33ba39 am ac21dbb4: Docs: Update "What\'s New" for L Final Preview samples 
* commit 'ac21dbb447158c7c75e154277c5f5f19ed456315':
  Docs: Update "What's New" for L Final Preview samples
 2014-10-17 16:09:45 +00:00
Quddus Chong
15d2e768d6 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 2014-10-17 16:08:44 +00:00