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

154203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
45f64af8f2 am 9c5896b8: Merge "Always execute resumeAppSwitches when launching something" into lmp-dev 
* commit '9c5896b808f77295aa5cd09cb37ad01bccd7994c':
  Always execute resumeAppSwitches when launching something
 2014-10-20 13:04:00 +00:00
Adrian Roos
9c5896b808 Merge "Always execute resumeAppSwitches when launching something" into lmp-dev 2014-10-20 12:59:00 +00:00
Baligh Uddin
b42786f491 am 67b404d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '67b404d688e8da44d104d54c78a8e37f88a4529b':
  Import translations. DO NOT MERGE
 2014-10-19 22:17:13 +00:00
Baligh Uddin
478ad70c48 am a4cbfb82: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a4cbfb822ea1afc110dc974f22e22906741f5c2e':
  Import translations. DO NOT MERGE
 2014-10-19 22:17:10 +00:00
Baligh Uddin
67b404d688 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 22:11:42 +00:00
Baligh Uddin
a4cbfb822e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 22:11:39 +00:00
Baligh Uddin
3b7e7817c5 Import translations. DO NOT MERGE 
Change-Id: Ie58f06a42538d4d68cd07c8bf92a4a7104d01a1a
Auto-generated-cl: translation import
 2014-10-19 13:18:18 -07:00
Baligh Uddin
425c06a0b0 am 4199680a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4199680a9da3fa01be65606e735deab3be089b23':
  Import translations. DO NOT MERGE
 2014-10-19 19:57:36 +00:00
Baligh Uddin
297013dd4c am 7fda5c91: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7fda5c91e5cb77e29852dd093bbbe0a2667cf2c7':
  Import translations. DO NOT MERGE
 2014-10-19 19:57:33 +00:00
Baligh Uddin
4ceb3c0412 am cfccba99: (-s ours) Import translations. DO NOT MERGE 
* commit 'cfccba99a234a5883300a7542ec12ddfec012ff3':
  Import translations. DO NOT MERGE
 2014-10-19 19:57:29 +00:00
Baligh Uddin
b5c8ec76d7 Import translations. DO NOT MERGE 
Change-Id: I382cff15f6fd4e02e2781bbb2b51e7eb3897b6fc
Auto-generated-cl: translation import
 2014-10-19 12:55:23 -07:00
Baligh Uddin
4199680a9d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 19:46:09 +00:00
Baligh Uddin
7fda5c91e5 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 19:46:09 +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
Baligh Uddin
b18d26738d Import translations. DO NOT MERGE 
Change-Id: Ia00d92d408a620fb80268de3413c2299c9f9ed18
Auto-generated-cl: translation import
 2014-10-19 10:52:12 -07:00
Baligh Uddin
7d369a6d5b Import translations. DO NOT MERGE 
Change-Id: I4ab5446cb270035eae9fce5bad1652ca57c9c5d8
Auto-generated-cl: translation import
 2014-10-19 10:50:27 -07:00
smain@google.com
27d8656c16 am a2f07a88: add info about device owner app to the workplace highlights 
* commit 'a2f07a88aa92d60b28295e84f440dbb4025d3eeb':
  add info about device owner app to the workplace highlights
 2014-10-19 02:42:00 +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
fb604203d2 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:50 +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
e91b7b11ac 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:40 +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
Prem Kumar
3f12569dff 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:03 +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
e61519b4a5 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:21 +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
4183a2fc83 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:57:18 +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
a054a8280c 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:41 +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
9621b79396 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:19:31 +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
ebb38bcc03 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:12 +00:00
Svetoslav
cd2b54e6e5 Merge "Accessibility no longer overrides strong encryption." into lmp-dev 2014-10-17 22:59:22 +00:00
Adam Lesinski
83fae208fe 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:56:10 +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
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
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
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
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