OSDN Git Service
Elliott Hughes [Tue, 28 Oct 2014 04:39:24 +0000 (04:39 +0000)]
am
ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."
* commit '
ced7ebdb1d522b4206e2048b278554ca841aeaba':
Migrate off timeFormat12 and timeFormat24.
Craig Mautner [Fri, 24 Oct 2014 20:12:08 +0000 (13:12 -0700)]
resolved conflicts for merge of
2bf3800b to stage-aosp-master
Change-Id: I3e650f90521e4d615504c3423ab228966389a482
Elliott Hughes [Thu, 23 Oct 2014 18:21:56 +0000 (18:21 +0000)]
Merge "Migrate off timeFormat12 and timeFormat24."
Elliott Hughes [Thu, 23 Oct 2014 18:06:43 +0000 (11:06 -0700)]
Migrate off timeFormat12 and timeFormat24.
libcore now offers a wider variety of 12-/24-hour time formats,
so be more specific about which one we want here.
(cherry-pick of
85f60d3a03b5b5d9a0e8b8a138eb85a6b53a1eca.)
Bug:
10361358
Change-Id: I846ab7a6f84cd49e876ad21e9366aff1600e0530
Craig Mautner [Wed, 22 Oct 2014 21:19:43 +0000 (21:19 +0000)]
Merge "Doesn't re-sort app windows when move task to top"
Bill Yi [Wed, 22 Oct 2014 16:00:49 +0000 (09:00 -0700)]
Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master
Change-Id: I7063b7b52e9c09a57eb6bf3b4ffa3716d58ebf43
tingna_sung [Mon, 20 Oct 2014 07:38:21 +0000 (15:38 +0800)]
Doesn't re-sort app windows when move task to top
To avoid app window isn't moved by new task order when move task to top
Change-Id: I5f8a901bb2f20a163b7fa0a59d1dc58c1fca5f1f
Signed-off-by: tingna_sung <tingna_sung@htc.com>
Craig Mautner [Tue, 21 Oct 2014 19:45:41 +0000 (19:45 +0000)]
am
4c101015: Merge "Avoid to skip app window due to un-assigned sending to bottom state while app window sort"
* commit '
4c1010152e487d3471e6703e8a9f8c1010488d47':
Avoid to skip app window due to un-assigned sending to bottom state while app window sort
Craig Mautner [Tue, 21 Oct 2014 19:24:17 +0000 (19:24 +0000)]
Merge "Avoid to skip app window due to un-assigned sending to bottom state while app window sort"
Elliott Hughes [Tue, 21 Oct 2014 17:53:50 +0000 (17:53 +0000)]
am
388dbd28: Merge "Include <time.h> for clock_nanosleep."
* commit '
388dbd28ac977782c2ff7a0ba97e2fbfaebfed4b':
Include <time.h> for clock_nanosleep.
Elliott Hughes [Tue, 21 Oct 2014 17:49:02 +0000 (17:49 +0000)]
Merge "Include <time.h> for clock_nanosleep."
Elliott Hughes [Tue, 21 Oct 2014 17:41:33 +0000 (10:41 -0700)]
Include <time.h> for clock_nanosleep.
Change-Id: If3098fa03003bce5d06d60e9129c10cce3c850bb
tingna_sung [Mon, 6 Oct 2014 08:36:40 +0000 (16:36 +0800)]
Avoid to skip app window due to un-assigned sending to bottom state while app window sort
should assign value of WindowToken.sendingToBottom according to the state of this token is moved to top or bottom
to avoid app window is skiped incorrectly due to sending to bottom state is un-assigned while app window sort
and finding focus window.
Change-Id: I190838d1d01ca229155d5176930178ab41335556
Signed-off-by: tingna_sung <tingna_sung@htc.com>
Dan Albert [Tue, 21 Oct 2014 16:06:36 +0000 (16:06 +0000)]
am
7f2bc6c7: Merge "More LOCAL_ADDITIONAL_DEPENDENCIES."
* commit '
7f2bc6c73b9f21515235fb638a0f510af3c45b44':
More LOCAL_ADDITIONAL_DEPENDENCIES.
Dan Albert [Tue, 21 Oct 2014 16:03:10 +0000 (16:03 +0000)]
Merge "More LOCAL_ADDITIONAL_DEPENDENCIES."
Dan Albert [Tue, 21 Oct 2014 15:58:39 +0000 (08:58 -0700)]
More LOCAL_ADDITIONAL_DEPENDENCIES.
Change-Id: I9bf20507442b0722e93446fdb32d8236be974e28
Dmitriy Ivanov [Tue, 21 Oct 2014 03:29:46 +0000 (03:29 +0000)]
am
9be7db6e: am
952dd924: Merge "Switch to libsigchain.a"
* commit '
9be7db6e3bc374efd9dcff744deab92148e20dbd':
Switch to libsigchain.a
Dmitriy Ivanov [Tue, 21 Oct 2014 03:22:34 +0000 (03:22 +0000)]
am
952dd924: Merge "Switch to libsigchain.a"
* commit '
952dd9241675fe73d4246dc16232682b32952bd3':
Switch to libsigchain.a
Dmitriy Ivanov [Tue, 21 Oct 2014 03:14:27 +0000 (03:14 +0000)]
Merge "Switch to libsigchain.a"
RoboErik [Mon, 20 Oct 2014 22:13:58 +0000 (22:13 +0000)]
am
2fa604fc: Merge "Add missing break to switch statement" into lmp-dev
* commit '
2fa604fc59ded63a416066a0bc66f63069cae7f3':
Add missing break to switch statement
RoboErik [Mon, 20 Oct 2014 22:08:06 +0000 (22:08 +0000)]
Merge "Add missing break to switch statement" into lmp-dev
Dan Albert [Mon, 20 Oct 2014 22:01:02 +0000 (22:01 +0000)]
am
9295a135: am
e40974d9: Merge "Fix an overflow found by ASAN."
* commit '
9295a1354eb8220be9a0a40985253c6cdfac35c3':
Fix an overflow found by ASAN.
RoboErik [Mon, 20 Oct 2014 21:56:32 +0000 (14:56 -0700)]
Add missing break to switch statement
the skip to queue item case was falling through when it shouldn't.
bug:
18058515
Change-Id: Ica20b59efad12a58ad16501146fc9a0d4595e184
Dan Albert [Mon, 20 Oct 2014 21:54:41 +0000 (21:54 +0000)]
am
e40974d9: Merge "Fix an overflow found by ASAN."
* commit '
e40974d92873462c4f1b100c7d03b3f41756c807':
Fix an overflow found by ASAN.
Dan Albert [Mon, 20 Oct 2014 21:48:43 +0000 (21:48 +0000)]
Merge "Fix an overflow found by ASAN."
Dan Albert [Mon, 20 Oct 2014 21:44:39 +0000 (14:44 -0700)]
Fix an overflow found by ASAN.
Sometimes len is 0.
Change-Id: I031000188edc57663a5519b00cbbb751600d32f4
smain@google.com [Mon, 20 Oct 2014 21:40:33 +0000 (21:40 +0000)]
am
21de5f3f: Doc change: misc changes to highlights.
* commit '
21de5f3f12071458c2a1cf3dd39bb9271ee13e92':
Doc change: misc changes to highlights.
smain@google.com [Mon, 20 Oct 2014 21:33:00 +0000 (14:33 -0700)]
Doc change: misc changes to highlights.
Change-Id: I60964bf1d8e299985da9ca6b2b6cfb70a1477bbc
Dmitriy Ivanov [Mon, 20 Oct 2014 21:14:39 +0000 (14:14 -0700)]
Switch to libsigchain.a
Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
to export symbols from the static library.
Change-Id: I465806dcffc777a682523f74ae6f7ab61aaa6962
Adam Lesinski [Mon, 20 Oct 2014 20:59:49 +0000 (20:59 +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
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
ztenghui [Mon, 20 Oct 2014 20:36:34 +0000 (20:36 +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.
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
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
RoboErik [Mon, 20 Oct 2014 19:10:42 +0000 (19:10 +0000)]
am
578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev
* commit '
578fbe898f1652b3166bd4e20647572dec9dfb14':
Set the metadata rating correctly in RCC
RoboErik [Mon, 20 Oct 2014 19:07:51 +0000 (19:07 +0000)]
Merge "Set the metadata rating correctly in RCC" into lmp-dev
Geoff Mendal [Mon, 20 Oct 2014 17:02:22 +0000 (17:02 +0000)]
am
00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
00831836cdeeb4a61ba10c724c3ca33280937b62':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 16:56:45 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
smain@google.com [Mon, 20 Oct 2014 16:56:32 +0000 (16:56 +0000)]
am
065b94c6: update workplace description in lollipop highlights bug:
18038081
* commit '
065b94c6a634e7a765f2674cff696a75e76f6425':
update workplace description in lollipop highlights bug:
18038081
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
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
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
Geoff Mendal [Mon, 20 Oct 2014 13:58:44 +0000 (13:58 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
automerge:
bae5d85 -s ours
* commit '
bae5d85a773af7c40578160ca4ba4261de0c68c5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 13:41:24 +0000 (13:41 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
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
Adrian Roos [Mon, 20 Oct 2014 13:03:54 +0000 (13:03 +0000)]
am
9c5896b8: Merge "Always execute resumeAppSwitches when launching something" into lmp-dev
* commit '
9c5896b808f77295aa5cd09cb37ad01bccd7994c':
Always execute resumeAppSwitches when launching something
Adrian Roos [Mon, 20 Oct 2014 12:58:58 +0000 (12:58 +0000)]
Merge "Always execute resumeAppSwitches when launching something" into lmp-dev
Neil Fuller [Mon, 20 Oct 2014 10:16:08 +0000 (10:16 +0000)]
am
dfcf0655: am
09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"
* commit '
dfcf065505a12aa358af5cd2607fd355eee964c4':
Replacing FloatMath native implementation with calls to Math
Neil Fuller [Mon, 20 Oct 2014 10:10:34 +0000 (10:10 +0000)]
am
09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"
* commit '
09fd5a1873fa1ab51f4e428b1b909fea35091a51':
Replacing FloatMath native implementation with calls to Math
Neil Fuller [Mon, 20 Oct 2014 10:08:10 +0000 (10:08 +0000)]
Merge "Replacing FloatMath native implementation with calls to Math"
Nick Kralevich [Sat, 18 Oct 2014 21:10:46 +0000 (14:10 -0700)]
Replacing FloatMath native implementation with calls to Math
On modern versions of Android running in AOT mode
FloatMath is slower than Math. Calls to Math.sqrt(),
etc. are replaced by intrinsics which can be as small
as a single CPU opcode.
When running in interpreted mode the new
implementation is unfortunately slower, but I'm
judging this acceptable and likely to be improved
over time. This change saves a small amount of native
code.
Example timings:
Mako AOSP AOT:
Method: Original / New / Direct call to Math
ceil: 596ns / 146.ns / 111ns
sqrt: 694ns / 56ns / 25ns
Mako AOSP interpreted:
Method: Original / New / Direct call to Math
ceil: 1900ns / 2307ns / 1485ns
sqrt: 1998ns / 2603ns / 1788ns
Other calls Mako AOT:
Method: Original / New
cos: 635ns / 270ns
exp: 566ns / 324ns
floor: 604ns / 150ns
hypot: 631ns / 232ns
pow: 936ns / 643ns
sin: 641ns / 299ns
The advice to use Math directly, in preference to
FloatMath, is still good. FloatMath will be deprecated
separately.
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: If07fcbd78543d13bc6d75f9743f999860e8d58d7
Baligh Uddin [Sun, 19 Oct 2014 22:16:55 +0000 (22:16 +0000)]
am
67b404d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
67b404d688e8da44d104d54c78a8e37f88a4529b':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 22:16:50 +0000 (22:16 +0000)]
am
a4cbfb82: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
a4cbfb822ea1afc110dc974f22e22906741f5c2e':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 22:11:41 +0000 (22:11 +0000)]
Merge "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
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
Baligh Uddin [Sun, 19 Oct 2014 19:57:50 +0000 (19:57 +0000)]
am
4199680a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
4199680a9da3fa01be65606e735deab3be089b23':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 19:57:45 +0000 (19:57 +0000)]
am
7fda5c91: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
7fda5c91e5cb77e29852dd093bbbe0a2667cf2c7':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 19:57:40 +0000 (19:57 +0000)]
am
cfccba99: (-s ours) Import translations. DO NOT MERGE
* commit '
cfccba99a234a5883300a7542ec12ddfec012ff3':
Import 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
Baligh Uddin [Sun, 19 Oct 2014 19:46:08 +0000 (19:46 +0000)]
Merge "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
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
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
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
smain@google.com [Sun, 19 Oct 2014 01:51:15 +0000 (01:51 +0000)]
add info about device owner app to the workplace highlights
automerge:
a2f07a8
* commit '
a2f07a88aa92d60b28295e84f440dbb4025d3eeb':
add 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
smain@google.com [Sun, 19 Oct 2014 00:08:43 +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
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
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
smain@google.com [Sat, 18 Oct 2014 23:19:49 +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.
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
Elliott Hughes [Sat, 18 Oct 2014 20:53:38 +0000 (20:53 +0000)]
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"
Elliott Hughes [Sat, 18 Oct 2014 20:48:03 +0000 (20:48 +0000)]
am
4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math""
* commit '
4cd671e4d27befdd576fa86051956c3cafad6808':
Revert "Replacing FloatMath native implementation with calls to Math"
Elliott Hughes [Sat, 18 Oct 2014 20:43:07 +0000 (20:43 +0000)]
Merge "Revert "Replacing FloatMath native implementation with calls to Math""
Elliott Hughes [Sat, 18 Oct 2014 20:41:27 +0000 (20:41 +0000)]
Revert "Replacing FloatMath native implementation with calls to Math"
This reverts commit
32b88b48daa7383880088246d7222dd93cf55285.
Change-Id: I40ea17f3a68f2b53eb013aebd3ba1becdc724f94
Prem Kumar [Sat, 18 Oct 2014 19:56:23 +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
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
Alan Viverette [Sat, 18 Oct 2014 00:26:00 +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
Alan Viverette [Sat, 18 Oct 2014 00:20:26 +0000 (00:20 +0000)]
Merge "Translate compound button drawable by scroll position" into lmp-dev
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
Kristian Monsen [Fri, 17 Oct 2014 23:56:57 +0000 (23:56 +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
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
Jim Miller [Fri, 17 Oct 2014 23:52:44 +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
Jim Miller [Fri, 17 Oct 2014 23:48:20 +0000 (23:48 +0000)]
Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
Yorke Lee [Fri, 17 Oct 2014 23:20:26 +0000 (23:20 +0000)]
am
e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev
* commit '
e4e3fcec415cdc9739f32ce1eaaec67666e5454d':
Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions
Yorke Lee [Fri, 17 Oct 2014 23:16:33 +0000 (23:16 +0000)]
Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev
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
Svetoslav [Fri, 17 Oct 2014 23:04:13 +0000 (23:04 +0000)]
am
cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev
* commit '
cd2b54e6e546099e028f9e41966ab7cf1deedd3c':
Accessibility no longer overrides strong encryption.
Svetoslav [Fri, 17 Oct 2014 22:59:20 +0000 (22:59 +0000)]
Merge "Accessibility no longer overrides strong encryption." into lmp-dev
Adam Lesinski [Fri, 17 Oct 2014 22:55:25 +0000 (22:55 +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
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
William Bourke [Fri, 17 Oct 2014 22:04:44 +0000 (22:04 +0000)]
am
84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
* commit '
84b4791aaf0384a334068a97c70fcda162cfadab':
Modified lollipop Easter egg for TV compatibility
Joe Fernandez [Fri, 17 Oct 2014 22:04:38 +0000 (22:04 +0000)]
am
6dc5d683: docs: Android L release fixes
* commit '
6dc5d68399377eb8d6a3132c2af475d92ed8aca5':
docs: Android L release fixes
William Bourke [Fri, 17 Oct 2014 22:00:59 +0000 (22:00 +0000)]
Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
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
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
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
Joe Fernandez [Fri, 17 Oct 2014 21:44:39 +0000 (21:44 +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
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