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

158692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
e508ee3d95 am cfccba99: (-s ours) Import translations. DO NOT MERGE 
* commit 'cfccba99a234a5883300a7542ec12ddfec012ff3':
  Import translations. DO NOT MERGE
 2014-10-19 19:57:40 +00:00
Baligh Uddin
cfccba99a2 Import translations. DO NOT MERGE 
Change-Id: I53740eab00c3d795b9e7514e079bc2a74b557d95
Auto-generated-cl: translation import
 2014-10-19 10:56:51 -07:00
smain@google.com
f43938dcbd add info about device owner app to the workplace highlights 
automerge: a2f07a8

* commit 'a2f07a88aa92d60b28295e84f440dbb4025d3eeb':
  add info about device owner app to the workplace highlights
 2014-10-19 01:51:15 +00:00
smain@google.com
a2f07a88aa add info about device owner app to the workplace highlights 
Change-Id: Ib1c5809e0d9e923fd71f4b33b1ef44091f1f3df4
 2014-10-18 18:20:20 -07:00
smain@google.com
a5704a0896 am f3e585ab: Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev 
* commit 'f3e585ab20be006c8d5f3a033f9ade8a9dc6b55f':
  add glare effect to screenshot and add 1x version with srcset
 2014-10-19 00:08:43 +00:00
smain@google.com
f3e585ab20 Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev 2014-10-19 00:04:54 +00:00
smain@google.com
02f9a5d4d7 add glare effect to screenshot and add 1x version with srcset 
Change-Id: I28ccd7bf509a65859b81e4fed8c63fbe62dad0b4
 2014-10-18 16:44:06 -07:00
smain@google.com
a525b72ea6 am 9e9d5a36: add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there. 
* commit '9e9d5a369fb00730d58220eaa79082e351cf8bcd':
  add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there.
 2014-10-18 23:19:49 +00:00
smain@google.com
9e9d5a369f add info about workspaces to the lollipop highlights 
also move the workplace launcher image from the API Overview to
the highlights... and also just remove all images from the Overview
for simplicity there.

Change-Id: I36cc6d58efa6c5c912971b8636fde064b0f26797
 2014-10-18 16:14:42 -07:00
Elliott Hughes
5fc9f9c293 am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math"" 
* commit '84e6d466edc2aba711f90431a1cd209d11c0e70d':
  Revert "Replacing FloatMath native implementation with calls to Math"
 2014-10-18 20:53:38 +00:00
Elliott Hughes
84e6d466ed am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math"" 
* commit '4cd671e4d27befdd576fa86051956c3cafad6808':
  Revert "Replacing FloatMath native implementation with calls to Math"
 2014-10-18 20:48:03 +00:00
Elliott Hughes
4cd671e4d2 Merge "Revert "Replacing FloatMath native implementation with calls to Math"" 2014-10-18 20:43:07 +00:00
Elliott Hughes
b3b68d0333 Revert "Replacing FloatMath native implementation with calls to Math" 
This reverts commit 32b88b48daa7383880088246d7222dd93cf55285.

Change-Id: I40ea17f3a68f2b53eb013aebd3ba1becdc724f94
 2014-10-18 20:41:27 +00:00
Prem Kumar
377f78f6b5 am 7666c912: Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev 
* commit '7666c912b820e61c58b57ad691b4b3babca9fbf9':
  set autojoin associated scan frequency to 20 seconds
 2014-10-18 19:56:23 +00:00
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