OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into...
Adam Lesinski [Mon, 20 Oct 2014 21:00:23 +0000 (21:00 +0000)]
am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev

* commit '3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad':
  AAPT: Fix path for final generated resources on Windows

9 years agoMerge "AAPT: Fix path for final generated resources on Windows" into lmp-dev
Adam Lesinski [Mon, 20 Oct 2014 20:55:48 +0000 (20:55 +0000)]
Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev

9 years agoam 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear...
ztenghui [Mon, 20 Oct 2014 20:35:58 +0000 (20:35 +0000)]
am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev

* commit '877ce2c42b5d423719246f5458cd66fa9fddb317':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.

9 years agoMerge "Make sure the bitmap from VD's cache is drawn using bi-linear filter." into...
ztenghui [Mon, 20 Oct 2014 20:29:15 +0000 (20:29 +0000)]
Merge "Make sure the bitmap from VD's cache is drawn using bi-linear filter." into lmp-dev

9 years agoAAPT: Fix path for final generated resources on Windows
Adam Lesinski [Mon, 20 Oct 2014 19:15:25 +0000 (12:15 -0700)]
AAPT: Fix path for final generated resources on Windows

Change-Id: Id11ac79b281b51747c73f90406ebd60023c54f92

9 years agoam 578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev
RoboErik [Mon, 20 Oct 2014 19:13:20 +0000 (19:13 +0000)]
am 578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev

* commit '578fbe898f1652b3166bd4e20647572dec9dfb14':
  Set the metadata rating correctly in RCC

9 years agoMerge "Set the metadata rating correctly in RCC" into lmp-dev
RoboErik [Mon, 20 Oct 2014 19:07:51 +0000 (19:07 +0000)]
Merge "Set the metadata rating correctly in RCC" into lmp-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 20 Oct 2014 17:02:53 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

9 years agoam 00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Mon, 20 Oct 2014 17:02:10 +0000 (17:02 +0000)]
am 00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '00831836cdeeb4a61ba10c724c3ca33280937b62':
  Import translations. DO NOT MERGE

9 years agoam 065b94c6: update workplace description in lollipop highlights bug: 18038081
smain@google.com [Mon, 20 Oct 2014 16:57:22 +0000 (16:57 +0000)]
am 065b94c6: update workplace description in lollipop highlights bug: 18038081

* commit '065b94c6a634e7a765f2674cff696a75e76f6425':
  update workplace description in lollipop highlights bug: 18038081

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Mon, 20 Oct 2014 16:56:45 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

9 years agoupdate workplace description in lollipop highlights
smain@google.com [Mon, 20 Oct 2014 16:41:08 +0000 (09:41 -0700)]
update workplace description in lollipop highlights
bug: 18038081

Change-Id: I612fc52392bc0fb71cc2e7b4c0da1fcaae6ac6fe

9 years agoSet the metadata rating correctly in RCC
RoboErik [Mon, 20 Oct 2014 16:48:13 +0000 (09:48 -0700)]
Set the metadata rating correctly in RCC

We weren't setting the ratings in the new MediaMetadata from RCC.
This adds some code to set them correctly.

bug:18051829
Change-Id: I358eeb2b25b3fb9bd9a5d207eb3314bb2cdff25e

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 16:44:01 +0000 (09:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id9f97226c8140113ba6f35b67b9a7855d591ff5e
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 16:34:39 +0000 (09:34 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3dd702947875349b8ca04edb813687588e4db689
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 20 Oct 2014 14:13:08 +0000 (14:13 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

9 years agoam bae5d85a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Mon, 20 Oct 2014 14:10:05 +0000 (14:10 +0000)]
am bae5d85a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'bae5d85a773af7c40578160ca4ba4261de0c68c5':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 14:09:28 +0000 (07:09 -0700)]
Import translations. DO NOT MERGE

Change-Id: I475289e0e1a2e21a9e7be5bc08dce515e3386812
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Mon, 20 Oct 2014 13:41:24 +0000 (13:41 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 13:35:29 +0000 (06:35 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9d2178c81e9acc3ce353f317787cb12f6e158666
Auto-generated-cl: translation import

9 years agoam 9c5896b8: Merge "Always execute resumeAppSwitches when launching something" into...
Adrian Roos [Mon, 20 Oct 2014 13:04:00 +0000 (13:04 +0000)]
am 9c5896b8: Merge "Always execute resumeAppSwitches when launching something" into lmp-dev

* commit '9c5896b808f77295aa5cd09cb37ad01bccd7994c':
  Always execute resumeAppSwitches when launching something

9 years agoMerge "Always execute resumeAppSwitches when launching something" into lmp-dev
Adrian Roos [Mon, 20 Oct 2014 12:58:58 +0000 (12:58 +0000)]
Merge "Always execute resumeAppSwitches when launching something" into lmp-dev

9 years agoam 67b404d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 22:17:13 +0000 (22:17 +0000)]
am 67b404d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '67b404d688e8da44d104d54c78a8e37f88a4529b':
  Import translations. DO NOT MERGE

9 years agoam a4cbfb82: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 22:17:10 +0000 (22:17 +0000)]
am a4cbfb82: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'a4cbfb822ea1afc110dc974f22e22906741f5c2e':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 22:11:41 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 22:11:32 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 20:18:18 +0000 (13:18 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie58f06a42538d4d68cd07c8bf92a4a7104d01a1a
Auto-generated-cl: translation import

9 years agoam 4199680a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 19:57:36 +0000 (19:57 +0000)]
am 4199680a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '4199680a9da3fa01be65606e735deab3be089b23':
  Import translations. DO NOT MERGE

9 years agoam 7fda5c91: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 19:57:33 +0000 (19:57 +0000)]
am 7fda5c91: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '7fda5c91e5cb77e29852dd093bbbe0a2667cf2c7':
  Import translations. DO NOT MERGE

9 years agoam cfccba99: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 19:57:29 +0000 (19:57 +0000)]
am cfccba99: (-s ours) Import translations. DO NOT MERGE

* commit 'cfccba99a234a5883300a7542ec12ddfec012ff3':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 19:55:23 +0000 (12:55 -0700)]
Import translations. DO NOT MERGE

Change-Id: I382cff15f6fd4e02e2781bbb2b51e7eb3897b6fc
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 19:46:08 +0000 (19:46 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 19 Oct 2014 19:46:06 +0000 (19:46 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 17:56:51 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE

Change-Id: I53740eab00c3d795b9e7514e079bc2a74b557d95
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 17:52:12 +0000 (10:52 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia00d92d408a620fb80268de3413c2299c9f9ed18
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 17:50:27 +0000 (10:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: I4ab5446cb270035eae9fce5bad1652ca57c9c5d8
Auto-generated-cl: translation import

9 years agoam a2f07a88: add info about device owner app to the workplace highlights
smain@google.com [Sun, 19 Oct 2014 02:42:00 +0000 (02:42 +0000)]
am a2f07a88: add info about device owner app to the workplace highlights

* commit 'a2f07a88aa92d60b28295e84f440dbb4025d3eeb':
  add info about device owner app to the workplace highlights

9 years agoadd info about device owner app to the workplace highlights
smain@google.com [Sun, 19 Oct 2014 01:18:49 +0000 (18:18 -0700)]
add info about device owner app to the workplace highlights

Change-Id: Ib1c5809e0d9e923fd71f4b33b1ef44091f1f3df4

9 years agoam f3e585ab: Merge "add glare effect to screenshot and add 1x version with srcset...
smain@google.com [Sun, 19 Oct 2014 00:08:50 +0000 (00:08 +0000)]
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

9 years agoMerge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev
smain@google.com [Sun, 19 Oct 2014 00:04:52 +0000 (00:04 +0000)]
Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev

9 years agoadd glare effect to screenshot and add 1x version with srcset
smain@google.com [Sat, 18 Oct 2014 23:44:06 +0000 (16:44 -0700)]
add glare effect to screenshot and add 1x version with srcset

Change-Id: I28ccd7bf509a65859b81e4fed8c63fbe62dad0b4

9 years agoam 9e9d5a36: add info about workspaces to the lollipop highlights also move the workp...
smain@google.com [Sat, 18 Oct 2014 23:19:40 +0000 (23:19 +0000)]
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.

9 years agoadd info about workspaces to the lollipop highlights
smain@google.com [Sat, 18 Oct 2014 22:16:53 +0000 (15:16 -0700)]
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

9 years agoam 7666c912: Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev
Prem Kumar [Sat, 18 Oct 2014 19:56:03 +0000 (19:56 +0000)]
am 7666c912: Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev

* commit '7666c912b820e61c58b57ad691b4b3babca9fbf9':
  set autojoin associated scan frequency to 20 seconds

9 years agoMerge "set autojoin associated scan frequency to 20 seconds" into lmp-dev
Prem Kumar [Sat, 18 Oct 2014 19:51:50 +0000 (19:51 +0000)]
Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev

9 years agoam 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev
Alan Viverette [Sat, 18 Oct 2014 00:26:21 +0000 (00:26 +0000)]
am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev

* commit '15e7b2ac60b0e6355e6ed5c1be676744c23f5a0e':
  Translate compound button drawable by scroll position

9 years agoMerge "Translate compound button drawable by scroll position" into lmp-dev
Alan Viverette [Sat, 18 Oct 2014 00:20:26 +0000 (00:20 +0000)]
Merge "Translate compound button drawable by scroll position" into lmp-dev

9 years agoTranslate compound button drawable by scroll position
Alan Viverette [Sat, 18 Oct 2014 00:19:12 +0000 (17:19 -0700)]
Translate compound button drawable by scroll position

BUG: 18028674
Change-Id: Iaba848642b87f0d134c6a6c57e5756d883e45904

9 years agoam 5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev
Kristian Monsen [Fri, 17 Oct 2014 23:57:18 +0000 (23:57 +0000)]
am 5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev

* commit '5d6041813283086c5a290ad6ca07e05b1a6ffc14':
  Let TYPE_ANNOUNCEMENT be sent from any window

9 years agoMerge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev
Kristian Monsen [Fri, 17 Oct 2014 23:54:00 +0000 (23:54 +0000)]
Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev

9 years agoam c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into...
Jim Miller [Fri, 17 Oct 2014 23:52:41 +0000 (23:52 +0000)]
am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev

* commit 'c6c843fbe8fb8d9bdd012a472e22970ee89b9d24':
  Add utility methods to LockPatternUtils for encryption

9 years agoMerge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
Jim Miller [Fri, 17 Oct 2014 23:48:20 +0000 (23:48 +0000)]
Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev

9 years agoam e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into...
Yorke Lee [Fri, 17 Oct 2014 23:19:31 +0000 (23:19 +0000)]
am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev

* commit 'e4e3fcec415cdc9739f32ce1eaaec67666e5454d':
  Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions

9 years agoMerge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev
Yorke Lee [Fri, 17 Oct 2014 23:16:33 +0000 (23:16 +0000)]
Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev

9 years agoAdd utility methods to LockPatternUtils for encryption
Jim Miller [Fri, 17 Oct 2014 02:50:18 +0000 (19:50 -0700)]
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

9 years agoam cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev
Svetoslav [Fri, 17 Oct 2014 23:04:12 +0000 (23:04 +0000)]
am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev

* commit 'cd2b54e6e546099e028f9e41966ab7cf1deedd3c':
  Accessibility no longer overrides strong encryption.

9 years agoMerge "Accessibility no longer overrides strong encryption." into lmp-dev
Svetoslav [Fri, 17 Oct 2014 22:59:20 +0000 (22:59 +0000)]
Merge "Accessibility no longer overrides strong encryption." into lmp-dev

9 years agoam 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived...
Adam Lesinski [Fri, 17 Oct 2014 22:56:10 +0000 (22:56 +0000)]
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

9 years agoMerge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows...
Adam Lesinski [Fri, 17 Oct 2014 22:50:48 +0000 (22:50 +0000)]
Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev

9 years agoam 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
William Bourke [Fri, 17 Oct 2014 22:03:50 +0000 (22:03 +0000)]
am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev

* commit '84b4791aaf0384a334068a97c70fcda162cfadab':
  Modified lollipop Easter egg for TV compatibility

9 years agoam 6dc5d683: docs: Android L release fixes
Joe Fernandez [Fri, 17 Oct 2014 22:03:47 +0000 (22:03 +0000)]
am 6dc5d683: docs: Android L release fixes

* commit '6dc5d68399377eb8d6a3132c2af475d92ed8aca5':
  docs: Android L release fixes

9 years agoMerge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
William Bourke [Fri, 17 Oct 2014 22:00:59 +0000 (22:00 +0000)]
Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev

9 years agodocs: Android L release fixes
Joe Fernandez [Fri, 17 Oct 2014 20:57:15 +0000 (13:57 -0700)]
docs: Android L release fixes

- L Highlights fixes
b/18029526
- L API Overview fixes
b/18034482

Change-Id: I2e93ece18748c15a8fe10749e75008bf5ed9a7c0

9 years agoModified lollipop Easter egg for TV compatibility
William Bourke [Fri, 17 Oct 2014 18:13:11 +0000 (11:13 -0700)]
Modified lollipop Easter egg for TV compatibility

Bug: 17997922

Change-Id: I0e2e34245183cdd146ecca02ab09b2c4867770ec

9 years agoAAPT: Fix an issue where a resource name was incorrectly derived on Windows
Adam Lesinski [Fri, 17 Oct 2014 21:40:17 +0000 (14:40 -0700)]
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

9 years agoam 09cce6f5: Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE resul...
Joe Fernandez [Fri, 17 Oct 2014 21:46:10 +0000 (21:46 +0000)]
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

9 years agoMerge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 21:39:26 +0000 (21:39 +0000)]
Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev

9 years agoAccessibility no longer overrides strong encryption.
Svetoslav [Fri, 17 Oct 2014 18:38:06 +0000 (11:38 -0700)]
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

9 years agoLet TYPE_ANNOUNCEMENT be sent from any window
Kristian Monsen [Fri, 17 Oct 2014 21:13:07 +0000 (14:13 -0700)]
Let TYPE_ANNOUNCEMENT be sent from any window

Part of fix for bug 17905712

Change-Id: I4e4b09f6b6342a27744e42984d483ef8de18fbff

9 years agodocs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result
Andrew Solovay [Fri, 17 Oct 2014 21:05:22 +0000 (14:05 -0700)]
docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result

See first comment for doc staging directory.

bug: 18000631
Change-Id: I4dba47e0965947774adad86218369678311f4a0c

9 years agoam f21746fc: Merge "docs: update location of sample apps" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 19:52:07 +0000 (19:52 +0000)]
am f21746fc: Merge "docs: update location of sample apps" into lmp-dev

* commit 'f21746fca8603ed5a4d328b804ad6de24226ef49':
  docs: update location of sample apps

9 years agoMerge "docs: update location of sample apps" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 19:39:27 +0000 (19:39 +0000)]
Merge "docs: update location of sample apps" into lmp-dev

9 years agoam a865bb5d: Merge "Use the correct method to check if device is encrypted" into...
Amith Yamasani [Fri, 17 Oct 2014 19:00:36 +0000 (19:00 +0000)]
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

9 years agoam af8de90f: Merge "fix 1% mystery bug on preview image downloads. just remove the...
smain@google.com [Fri, 17 Oct 2014 18:56:06 +0000 (18:56 +0000)]
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.

9 years agoMerge "Use the correct method to check if device is encrypted" into lmp-dev
Amith Yamasani [Fri, 17 Oct 2014 18:55:57 +0000 (18:55 +0000)]
Merge "Use the correct method to check if device is encrypted" into lmp-dev

9 years agoMerge "fix 1% mystery bug on preview image downloads. just remove the hashchange...
smain@google.com [Fri, 17 Oct 2014 18:47:11 +0000 (18:47 +0000)]
Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev

9 years agofix 1% mystery bug on preview image downloads.
smain@google.com [Fri, 17 Oct 2014 18:45:33 +0000 (11:45 -0700)]
fix 1% mystery bug on preview image downloads.
just remove the hashchange listener; no more back-navigation, eh.

Change-Id: I6c822336f33448d9ce01e710fbea2ab134fb8718

9 years agoUse the correct method to check if device is encrypted
Amith Yamasani [Fri, 17 Oct 2014 18:16:58 +0000 (11:16 -0700)]
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

9 years agoam c598a4a4: Merge "docs: Fixed sound and vibration section in Android 5.0 API overvi...
Quddus Chong [Fri, 17 Oct 2014 18:37:29 +0000 (18:37 +0000)]
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.

9 years agoMerge "docs: Fixed sound and vibration section in Android 5.0 API overview." into...
Quddus Chong [Fri, 17 Oct 2014 18:32:01 +0000 (18:32 +0000)]
Merge "docs: Fixed sound and vibration section in Android 5.0 API overview." into lmp-dev

9 years agoAlways execute resumeAppSwitches when launching something
Jorim Jaggi [Fri, 17 Oct 2014 17:54:15 +0000 (19:54 +0200)]
Always execute resumeAppSwitches when launching something

Bug: 18024449
Change-Id: Ib5ea92d141d74676d00fd3118930bdb0ef5b2935

9 years agodocs: update location of sample apps
Scott Rowe [Fri, 17 Oct 2014 17:46:04 +0000 (10:46 -0700)]
docs: update location of sample apps

Change-Id: I5079d5578c29cde387d087ec8767ae03aaa7ebe2

9 years agoMake READ_VOICEMAIL/WRITE_VOICEMAIL system permissions
Yorke Lee [Fri, 17 Oct 2014 17:22:26 +0000 (10:22 -0700)]
Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions

Bug: 18020724
Change-Id: I5a0e5ef8a1e40ee23f4b132f5877b63a738e776e

9 years agodocs: Fixed sound and vibration section in Android 5.0 API overview.
Quddus Chong [Fri, 17 Oct 2014 17:08:41 +0000 (10:08 -0700)]
docs: Fixed sound and vibration section in Android 5.0 API overview.

Change-Id: Icb5379cb1c390c011c9ca8c1d585ebcaea8f92dc

9 years agoam 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev
Dianne Hackborn [Fri, 17 Oct 2014 17:15:08 +0000 (17:15 +0000)]
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.

9 years agoMerge "SDK only: hide the old L API version constant." into lmp-dev
Dianne Hackborn [Fri, 17 Oct 2014 17:11:23 +0000 (17:11 +0000)]
Merge "SDK only: hide the old L API version constant." into lmp-dev

9 years agoam fe511970: Merge "edits to the Lollipop highlights" into lmp-dev
smain@google.com [Fri, 17 Oct 2014 16:51:51 +0000 (16:51 +0000)]
am fe511970: Merge "edits to the Lollipop highlights" into lmp-dev

* commit 'fe51197084ab70ea48a9ddf13ecc0d0afe81d0ea':
  edits to the Lollipop highlights

9 years agoMerge "edits to the Lollipop highlights" into lmp-dev
smain@google.com [Fri, 17 Oct 2014 16:47:32 +0000 (16:47 +0000)]
Merge "edits to the Lollipop highlights" into lmp-dev

9 years agoedits to the Lollipop highlights
smain@google.com [Fri, 17 Oct 2014 16:25:24 +0000 (09:25 -0700)]
edits to the Lollipop highlights

Change-Id: I1702946aca8c30528488465be422a9b68a9ae049

9 years agoam 6da9e548: Merge "Updated Android SDK/Studio system requirements" into lmp-dev
Vince Harron [Fri, 17 Oct 2014 16:14:35 +0000 (16:14 +0000)]
am 6da9e548: Merge "Updated Android SDK/Studio system requirements" into lmp-dev

* commit '6da9e5481aa78fa3541f0546f237049f9d8e3b81':
  Updated Android SDK/Studio system requirements

9 years agoMerge "Updated Android SDK/Studio system requirements" into lmp-dev
Vince Harron [Fri, 17 Oct 2014 16:12:05 +0000 (16:12 +0000)]
Merge "Updated Android SDK/Studio system requirements" into lmp-dev

9 years agoam 15d2e768: Merge "docs: Updated Android 5.0 API Overview to reflect that setting...
Quddus Chong [Fri, 17 Oct 2014 16:10:02 +0000 (16:10 +0000)]
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.

9 years agoam ac21dbb4: Docs: Update "What\'s New" for L Final Preview samples
Trevor Johns [Fri, 17 Oct 2014 16:09:58 +0000 (16:09 +0000)]
am ac21dbb4: Docs: Update "What\'s New" for L Final Preview samples

* commit 'ac21dbb447158c7c75e154277c5f5f19ed456315':
  Docs: Update "What's New" for L Final Preview samples

9 years agoMerge "docs: Updated Android 5.0 API Overview to reflect that setting the device...
Quddus Chong [Fri, 17 Oct 2014 16:08:43 +0000 (16:08 +0000)]
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

9 years agoDocs: Update "What's New" for L Final Preview samples
Trevor Johns [Fri, 17 Oct 2014 16:00:38 +0000 (09:00 -0700)]
Docs: Update "What's New" for L Final Preview samples

Change-Id: Idc414ffa3b391212136601bd0f65dbcab07efe1e

9 years agodocs: Updated Android 5.0 API Overview to reflect that
Quddus Chong [Fri, 17 Oct 2014 15:29:30 +0000 (08:29 -0700)]
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.

Change-Id: I9a7be4529f757417a62ca376df39bf01309e1e69

9 years agoam 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into...
Jim Miller [Fri, 17 Oct 2014 09:34:37 +0000 (09:34 +0000)]
am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev

* commit '7d96dc6d98774ff9b7cf1370f9a5508c4eac6a85':
  Fix getStorageEncryptionStatus() in DevicePolicyManager

9 years agoMerge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev
Jim Miller [Fri, 17 Oct 2014 09:31:03 +0000 (09:31 +0000)]
Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev

9 years agoam 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev
Dirk Dougherty [Fri, 17 Oct 2014 09:25:33 +0000 (09:25 +0000)]
am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev

* commit '22fa76dac8de6cfd9e7bc1eb8800f4cddbfc0640':
  Doc change: Add Lollipop to platform versions table.

9 years agoMerge "Doc change: Add Lollipop to platform versions table." into lmp-dev
Dirk Dougherty [Fri, 17 Oct 2014 09:21:28 +0000 (09:21 +0000)]
Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev