Baligh Uddin
7d8322be33
Import translations. DO NOT MERGE
...
Change-Id: Ie5b6e1e51a0740818f15da6fcb5f49587a73722a
Auto-generated-cl: translation import
2014-04-02 09:11:59 -07:00
Christoph Studer
892c574ecc
Merge "Expose locations from NotifStackScrollLayout"
2014-04-02 13:14:03 +00:00
Kenny Guy
1ccace916c
Merge "Rename related users to profiles."
2014-04-02 13:06:28 +00:00
Christoph Studer
6e3ecebcec
Expose locations from NotifStackScrollLayout
...
Expose the position each child is rendered at from
NotificationStackScrollLayout.
Also add OnChildLocationsChangedListener interface so listeners
can be notified whenever the rendering changes.
Change-Id: Iab8706fc2c435f2ddf64d280f428ed562db94f19
2014-04-02 14:47:18 +02:00
Kenny Guy
2a764949c9
Rename related users to profiles.
...
Rename the related user concept as profiles.
When returning profiles of a user include the
user as a profile of itself.
Change-Id: Id5d4f29017b7ca6844632ce643f10331ad733e1d
2014-04-02 13:44:50 +01:00
Narayan Kamath
b69bb44558
resolved conflicts for merge of 71ab4f4f to master
...
Change-Id: I888c231f7579523e12fbd68f820f0775019e51e0
2014-04-02 11:52:07 +01:00
Narayan Kamath
71ab4f4f48
am ea9e5eca: am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."
...
* commit 'ea9e5ecac1e5240370f0e3f998b9c8b159ee9320':
Move zygote startup logic to the frameworks.
2014-04-02 10:41:24 +00:00
Narayan Kamath
ea9e5ecac1
am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."
...
* commit '17b1b8fe8c0c8f05f2077acc82428881bf591a78':
Move zygote startup logic to the frameworks.
2014-04-02 10:35:38 +00:00
Narayan Kamath
17b1b8fe8c
Merge "Move zygote startup logic to the frameworks."
2014-04-02 10:29:55 +00:00
Narayan Kamath
973b4663b0
Move zygote startup logic to the frameworks.
...
The Zygote class is now in com.android.internal.os. It is
responsible for the vast majority of work before and after
the call to fork(). It calls back into the Runtime via
the new dalvik.system.ZygoteHooks class to allow the Runtime
to perform pre fork cleanup and post fork initialization.
The native code in Zygote.cpp is a direct and straightforward
port of the existing code in art. Most differences are
superficial, for example :
- We use C style logging (ALOGE) instead of stream based
logging.
- We call env->FatalError() instead of using LOG(FATAL)
Change-Id: Ia101fb2af12d23894fe57e4134d2bc6d142e5059
2014-04-02 10:18:43 +01:00
Ricardo Cervera
fb0873268c
am 04c2a557: am c013eaad: am 5a218b18: am 8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
...
* commit '04c2a5571620927f702af3707845b1b05769dc46':
docs: Added notes to use the last SDK version to the Build your First App class.
2014-04-02 00:27:51 +00:00
Ricardo Cervera
04c2a55716
am c013eaad: am 5a218b18: am 8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
...
* commit 'c013eaad574bcb40152d90105d6fbc82293cbb11':
docs: Added notes to use the last SDK version to the Build your First App class.
2014-04-02 00:20:22 +00:00
Ricardo Cervera
c013eaad57
am 5a218b18: am 8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
...
* commit '5a218b186735534925d7fedb63f1c78a3a3ff543':
docs: Added notes to use the last SDK version to the Build your First App class.
2014-04-02 00:15:31 +00:00
Ricardo Cervera
5a218b1867
am 8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
...
* commit '8e183798d573ad4777a5f01fd6db8f86ca0e120f':
docs: Added notes to use the last SDK version to the Build your First App class.
2014-04-02 00:08:11 +00:00
Michael Kolb
118d252e75
am 4a812147: am 875eff83: Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev
...
* commit '4a8121478e5027bf61b5c711d6b1a748004edea2':
Add circular anti-aliasing mask to circular display
2014-04-02 00:03:29 +00:00
Ricardo Cervera
8e183798d5
Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
2014-04-02 00:03:00 +00:00
Christopher Tate
a2dbe4e3cd
Merge "Rejigger the invalid-key checks at backup time"
2014-04-01 23:45:24 +00:00
Christopher Tate
cba5941c60
Rejigger the invalid-key checks at backup time
...
Bug 13732002
Change-Id: Ic8f71234d1bbc7420eaa8e1762b999d09f308d46
2014-04-01 16:43:00 -07:00
Winson Chung
6ac3367d5d
Merge "Enabling filtering by base intent package."
2014-04-01 23:10:26 +00:00
Igor Murashkin
428ec926a2
Merge "camera2: Fix out-of-date metadata test"
2014-04-01 23:01:45 +00:00
Michael Kolb
4a8121478e
am 875eff83: Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev
...
* commit '875eff832f9f496740ceba2f12de6f5423225274':
Add circular anti-aliasing mask to circular display
2014-04-01 22:54:30 +00:00
Wei Wang
c90005d292
Use correct wifi batching parameter ranges.
...
Note these are slightly adjusted capabilities of N5.
Cherry pick.
Change-Id: Ia6888f6a5a69d135ff7e3c87d9744e18265fb3bf
2014-04-01 22:51:52 +00:00
Igor Murashkin
5c207ec9a0
camera2: Fix out-of-date metadata test
...
* The tag android.sensor.calibrationTransform1 was renamed
to android.sensor.calibrationTransform (1 removed)
Bug: 12002757
Change-Id: Ida0e37a30222f08d0d9bb3871717c74c21e428ac
2014-04-01 15:50:48 -07:00
Michael Kolb
875eff832f
Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev
2014-04-01 22:48:28 +00:00
Winson Chung
c6a1623cc4
Enabling filtering by base intent package.
...
- Toggling recents now unfilters the current stack before dismissing recents
Change-Id: Id0d240bf16bc32957ee7e5a9882a453044903d29
2014-04-01 15:31:52 -07:00
Michael Kolb
39a6db7cd5
Add circular anti-aliasing mask to circular display
...
Bug: 13635645
Add a 2 px wide anti-aliased circle as a Layer to WindowManagerService
Change-Id: Ic8d319ca43c222f5b2e69af896749b8f2018ce3e
2014-04-01 15:28:01 -07:00
Jeff Tinker
53c90cf916
am 6dc8063d: am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
...
* commit '6dc8063d2a06017f249181b4b5b07c54ce645943':
Support CAST V2 Authentication in MediaDrm
2014-04-01 22:23:21 +00:00
Craig Mautner
74ee938dcc
resolved conflicts for merge of ffb22827 to master
...
Change-Id: Ia01028203dfe87df91c828d681289e92b9371e3c
2014-04-01 15:20:16 -07:00
Jeff Tinker
6dc8063d2a
am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
...
* commit '433a063309ba9ff9cdce4f9688e027c642a79505':
Support CAST V2 Authentication in MediaDrm
2014-04-01 22:00:49 +00:00
Craig Mautner
ffb22827d7
am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev
...
* commit '2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 21:56:55 +00:00
Jeff Tinker
433a063309
Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
2014-04-01 21:54:29 +00:00
John Reck
4126693be3
Merge "Disable RenderThread"
2014-04-01 21:51:40 +00:00
John Reck
9afe775ca9
Disable RenderThread
...
Now that there's a half dozen bugs to fix, switch back
to the stable renderer until the issues are addressed
Change-Id: I1513cf26717e8ab6b1a038e86ae9a40f5f1a3c50
2014-04-01 14:49:21 -07:00
Craig Mautner
2b6fe2990d
am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev
...
* commit 'c70f15fe298655de02c2e72023fafe6fc33d2a55':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 21:48:04 +00:00
Craig Mautner
c70f15fe29
am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev
...
* commit '2fc798a2270cda98366776af489d45c1043e831d':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 21:41:15 +00:00
Michael Kolb
4bb047fa5e
Fix build after bad merge resolution
...
Change-Id: I4af3aae1114d31847fc13d56ab03af8c7ef74577
2014-04-01 14:38:57 -07:00
Alan Viverette
9b3b78bdaf
Merge "Quantum style for RatingBar, alert dialog layouts"
2014-04-01 21:27:03 +00:00
Jeff Tinker
e4095a80b6
Support CAST V2 Authentication in MediaDrm
...
Java API version
Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.
Change-Id: I23cfbbbc89c1226b7a3968ce8bc1e2d4bd41014a
related-to-bug: 12702350
2014-04-01 14:25:35 -07:00
Alan Viverette
2f472117d7
Quantum style for RatingBar, alert dialog layouts
...
Change-Id: I70cab4d32de44d41b08602bc11a09d451f267127
2014-04-01 14:24:49 -07:00
Fabrice Di Meglio
724a4f7aea
Merge "Update SearchIndexables contract for allowing summary ON and OFF indexing"
2014-04-01 21:17:03 +00:00
Michael Kolb
7fbde1e837
resolved conflict for merge of 2c73e08d to master
...
Change-Id: Iee2e1f773469db0ba26b153193945a6c246af151
2014-04-01 14:06:11 -07:00
Craig Mautner
2fc798a227
resolved conflicts for merge of 8c6e6e73 to klp-dev
...
Change-Id: I9fc9bc3d935e9e730ebca767d848b1c66203f3b4
2014-04-01 13:57:37 -07:00
Michael Kolb
2c73e08d36
am 17bbd976: Merge "Add outset to decor view measuring" into klp-modular-dev
...
* commit '17bbd976c0971f25447b2ce66117f08029dc2fa9':
Add outset to decor view measuring
2014-04-01 20:46:38 +00:00
John Spurlock
f96b6c427f
Merge "Zen Mode QS tweaks."
2014-04-01 20:41:08 +00:00
Michael Kolb
17bbd976c0
Merge "Add outset to decor view measuring" into klp-modular-dev
2014-04-01 20:40:35 +00:00
John Spurlock
1bdb48e31a
Zen Mode QS tweaks.
...
- Move settings button to the bottom.
- Align title left.
- Fix padding.
- Auto-activate on dialog launch.
Bug:13670014
Change-Id: I5a88e97a84b66bf6200473c147b71cc7ceeb0b95
2014-04-01 16:38:05 -04:00
Craig Mautner
8c6e6e7372
am 13b75939: am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit '13b75939596eec63c096fe9e85643b8c42a40b12':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 20:01:32 +00:00
Craig Mautner
13b7593959
am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit 'd4d2aa519fb1a9d54c14da858a4ab7ab0880f34d':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:54:59 +00:00
Craig Mautner
d4d2aa519f
am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit 'efbe7cc0ff5c85cc7956bb3099402c7ebbe20591':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:49:36 +00:00
Craig Mautner
efbe7cc0ff
am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit 'd1c82f8fc22216e9b544e3a3b521bcad05bc113d':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:43:41 +00:00