Narayan Kamath
ff34f6faaa
am 27b03e62: Merge "Create arch specific cache dirs during zygote startup."
...
* commit '27b03e6272479ed82762a4a5d6e4be4f26c1ed58':
Create arch specific cache dirs during zygote startup.
2014-05-01 10:39:52 +00:00
Narayan Kamath
41f40581ee
Merge "Fix x86 build in app_process."
2014-05-01 10:36:31 +00:00
Narayan Kamath
27b03e6272
Merge "Create arch specific cache dirs during zygote startup."
2014-05-01 10:36:28 +00:00
Alexandra Gherghina
df35d570ed
Adds an enabled state in UserInfo instead of DevicePolicyManager
...
Bug: 14377459
Change-Id: Ib4ec43d87da96c3dddaf9b7ae1796f261863a182
2014-05-01 11:34:27 +01:00
Yohei Yukawa
8596f6998e
Merge "Add unit tests for InputMethodSubtypeSwitchingController"
2014-05-01 10:34:05 +00:00
Narayan Kamath
d6183204e4
Fix x86 build in app_process.
...
Look for __i386__ and not __x86__.
(cherry picked from commit 47d526217b3fd0d17ba751c66d25cfaf1c6ed7cd)
Change-Id: I848ba351c378e59ab6744ca1983ae4463ae75ba4
2014-05-01 11:27:49 +01:00
Narayan Kamath
c9722bd8af
am 6c2e8062: am 70344223: am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."
...
* commit '6c2e806200dc1a422aa681bfd78aae1eb8f1d508':
Fix broken logging in Zygote.cpp.
2014-05-01 10:27:18 +00:00
Narayan Kamath
973cdeed8e
Create arch specific cache dirs during zygote startup.
...
The runtime expects them to exist before it's launched.
The boot image / art files are created during the first
zygote launch.
(cherry picked from commit da738713e4e2120a324e8ab6fd11aa0e54a3c66e)
Change-Id: I7472aa25c16a1cf95791af2bdf80ed0d73123872
2014-05-01 11:26:49 +01:00
Narayan Kamath
6c2e806200
am 70344223: am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."
...
* commit '703442238200c2f1a35b51e7aadc693322feb69d':
Fix broken logging in Zygote.cpp.
2014-05-01 10:22:56 +00:00
Narayan Kamath
7034422382
am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."
...
* commit 'fbb0ab02bed5c49159acb3dba6848a154e524169':
Fix broken logging in Zygote.cpp.
2014-05-01 10:18:11 +00:00
Narayan Kamath
fbb0ab02be
Merge "Fix broken logging in Zygote.cpp."
2014-05-01 10:15:01 +00:00
Yohei Yukawa
d1da115298
Add unit tests for InputMethodSubtypeSwitchingController
...
This CL adds unit tests for InputMethodSubtypeSwitchingController
as a ground work to make it aware of
supportsSwitchingToNextInputMethod in a subsequent CL.
This CL never changes existing behavior.
BUG: 12981505
Change-Id: I3b2c46c47c7686b811fa248ad549f20875367425
2014-05-01 19:13:25 +09:00
Narayan Kamath
160992da04
Fix broken logging in Zygote.cpp.
...
- Differentiate between clean exits and signals.
- Change the logic for the waitpid warning. We should log it
only if the *first* call to waitpid returned ECHILD.
Change-Id: I6bc50e4ffd100fb7f3f526d6b4056bed10b8045f
2014-05-01 10:11:57 +00:00
Robert Ly
8c636abb83
am f05bef95: am b76f7b35: am 8873025b: am f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs
...
* commit 'f05bef95fb1dd612f099fe54da71e308a16e79e8':
update wear stack notifications to coincide with devbyte code
2014-05-01 09:45:33 +00:00
Robert Ly
f05bef95fb
am b76f7b35: am 8873025b: am f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs
...
* commit 'b76f7b35db0040591492f026d0dc17678141b6cf':
update wear stack notifications to coincide with devbyte code
2014-05-01 09:42:08 +00:00
Robert Ly
b76f7b35db
am 8873025b: am f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs
...
* commit '8873025b2a52ca1ecccfaa9840e82681e17900d4':
update wear stack notifications to coincide with devbyte code
2014-05-01 09:37:01 +00:00
Nicolas Prevot
ff2e05e1f6
Merge "Introduce forwarding intents across profiles."
2014-05-01 09:17:13 +00:00
Robert Ly
8873025b2a
am f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs
...
* commit 'f26a71003de069355931eab340433ba8345ba3f7':
update wear stack notifications to coincide with devbyte code
2014-05-01 08:22:05 +00:00
Robert Ly
f26a71003d
Merge "update wear stack notifications to coincide with devbyte code" into klp-docs
2014-05-01 07:27:23 +00:00
Robert Ly
b8e3f209af
update wear stack notifications to coincide with devbyte code
...
Change-Id: I4ccfc39eb47c938b9c1e9ba9309aaba54319f53b
2014-05-01 00:23:42 -07:00
Chris Craik
64ab917e5e
Merge "Add more shadow control knobs"
2014-05-01 01:31:12 +00:00
Mark Renouf
d076121630
SwipeDismiss: limit fade to 50% alpha while swiping
...
BUG: 14319825
Change-Id: I3704fab77f2d3660ae374bdf16c767c124dcb8e9
2014-05-01 01:21:19 +00:00
Chris Craik
f5be3ca5cc
Add more shadow control knobs
...
Change-Id: I1ff500bf429029a97b681ced9df652f4ee9f1332
2014-04-30 18:20:30 -07:00
Winson Chung
e5c749085e
Merge "Disable Filtering."
2014-05-01 00:27:32 +00:00
Winson Chung
0553e12bc9
Disable Filtering.
...
Change-Id: I5c3aaaead7883b639ba24b28c04c1cafec0275c4
2014-04-30 17:26:28 -07:00
John Reck
abea8fa237
Merge "Add missing ifdefs"
2014-05-01 00:07:45 +00:00
John Reck
496b8770c1
Add missing ifdefs
...
Change-Id: I1c7c66cf81a31b56e6ae65d34b7936f9e8beec29
2014-04-30 16:59:40 -07:00
George Mount
1a5b294d39
Fix "blink" when going "back" quickly after entering Activity.
...
Bug 14445508
Activity Transitions would occasionally blink to black when
going "back." This was caused because the convertToTranslucent
callback was slow to come and could occur during the exit
transition while going back.
Change-Id: I17db25197926399dc22b50c595416dfa7b32b026
2014-04-30 16:59:31 -07:00
Jean-Michel Trivi
18bfd887f6
Merge "Fix MediaFocusControl index management for PlayerRecord"
2014-04-30 23:58:02 +00:00
Ricardo Cervera
f74b8a7738
am 6824e4e3: am 8bef5ea7: am 27515952: am ba333f2f: docs: Added release notes for Android Studio 0.5.2
...
* commit '6824e4e35164470c96cc4654afc88ccd179ac586':
docs: Added release notes for Android Studio 0.5.2
2014-04-30 23:44:50 +00:00
Elliott Hughes
8c2fff2385
am fd955f14: am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
...
* commit 'fd955f14d6c87dffd1a20c36ad8001705495f831':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.
2014-04-30 23:35:39 +00:00
Deepanshu Gupta
5e2901ba1c
am cd50f729: (-s ours) am c046c767: am c0c96012: am 4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
...
* commit 'cd50f7294654bf04195d9d1078a984ff9462093c':
Fix class name for OverflowMenuButton [DO NOT MERGE]
2014-04-30 23:35:07 +00:00
Mindy Pereira
99c4f0713e
am 006c2110: am 11b715da: Merge "Make touch slop region smaller for watch" into klp-modular-dev
...
* commit '006c211056d3a7561d2d97abae369603cc48e63a':
Make touch slop region smaller for watch
2014-04-30 23:34:56 +00:00
Michael Wright
a2dc6fab5e
am 474b0749: am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
...
* commit '474b07497bf1a33ccc889d21287269cd40dc0cf4':
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
2014-04-30 23:28:28 +00:00
Elliott Hughes
fae7bedcf0
am f84493ec: am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
...
* commit 'f84493ec95bfce41106673645a3e56b185e54df5':
Fix for native leaks in YuvToJpegEncoder.cpp
2014-04-30 23:19:03 +00:00
Ricardo Cervera
6824e4e351
am 8bef5ea7: am 27515952: am ba333f2f: docs: Added release notes for Android Studio 0.5.2
...
* commit '8bef5ea70161586287ec06e9bd74b30604cd3f2c':
docs: Added release notes for Android Studio 0.5.2
2014-04-30 22:40:00 +00:00
Jean-Michel Trivi
0d90876893
Fix MediaFocusControl index management for PlayerRecord
...
When updating the PlayerRecord stack on playstate changes and
media button event receiver registrations, evaluate the index
of the stack entry to remove against the index of the last playing
entry as this index was valid before the entry was removed.
This affects the insertion index.
Change-Id: Iec58d2df6bcbd8f55925e9e0f9d48f698f7cf4e5
2014-04-30 15:38:32 -07:00
Ricardo Cervera
8bef5ea701
am 27515952: am ba333f2f: docs: Added release notes for Android Studio 0.5.2
...
* commit '27515952f54a8c98eaec694ce74c3b9d9b152746':
docs: Added release notes for Android Studio 0.5.2
2014-04-30 22:03:40 +00:00
Ricardo Cervera
27515952f5
am ba333f2f: docs: Added release notes for Android Studio 0.5.2
...
* commit 'ba333f2f4c2ca5325b4df1b131c6c26a18beb877':
docs: Added release notes for Android Studio 0.5.2
2014-04-30 21:59:19 +00:00
John Reck
4ac525a9f1
Merge "Use resize, not reserve"
2014-04-30 21:48:09 +00:00
Ricardo Cervera
ba333f2f4c
docs: Added release notes for Android Studio 0.5.2
...
Change-Id: Ia364620d0ab14648b4db523890c529a0dc5b940d
2014-04-30 14:41:44 -07:00
Kristian Monsen
b56ddaaf0e
Merge "Try to not start up chromium when not needed"
2014-04-30 21:40:31 +00:00
Elliott Hughes
fd955f14d6
am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
...
* commit '6a6979ad17dfb492fb85a979e8f8688e4ed973b2':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.
2014-04-30 21:35:45 +00:00
Elliott Hughes
6a6979ad17
am 86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
...
* commit '86315c452b955bf0b874f45c1a2e15aedda91a52':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.
2014-04-30 21:33:06 +00:00
Elliott Hughes
86315c452b
Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
2014-04-30 21:29:52 +00:00
John Reck
52622668f9
Use resize, not reserve
...
Reserve ensures the underlying buffer is the correct size, but
iterating across it is not necessarily valid. Use resize() instead
to ensure that the iterator access is valid
Change-Id: I35ff5f4416bb94cf4ce2c6acf72ffd17ab3e523a
2014-04-30 14:19:56 -07:00
Deepanshu Gupta
cd50f72946
am c046c767: am c0c96012: am 4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
...
* commit 'c046c76739b210d912dae38bf945d60b8d69ab11':
Fix class name for OverflowMenuButton [DO NOT MERGE]
2014-04-30 20:38:49 +00:00
Deepanshu Gupta
c046c76739
am c0c96012: am 4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
...
* commit 'c0c96012c667d1d91d8f6b763df45e566cae0eaf':
Fix class name for OverflowMenuButton [DO NOT MERGE]
2014-04-30 20:35:04 +00:00
Deepanshu Gupta
c0c96012c6
am 4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
...
* commit '4b5fa4d318e7efaffdc678e0cb8953ffc78c2b1e':
Fix class name for OverflowMenuButton [DO NOT MERGE]
2014-04-30 20:31:35 +00:00
Mindy Pereira
006c211056
am 11b715da: Merge "Make touch slop region smaller for watch" into klp-modular-dev
...
* commit '11b715da9be818eb4a1c7a3d77b5d0c4ff03e5a2':
Make touch slop region smaller for watch
2014-04-30 19:46:07 +00:00