Baligh Uddin
cab4b17cd2
Merge "Import translations. DO NOT MERGE"
2014-06-12 03:30:50 +00:00
Baligh Uddin
d9b63709aa
Import translations. DO NOT MERGE
...
Change-Id: I3befd03bdc010b6d87538e91ecb3b7f8b644dca8
Auto-generated-cl: translation import
2014-06-15 12:55:54 +00:00
Baligh Uddin
d6db9bc985
Import translations. DO NOT MERGE
...
Change-Id: I01218df57947e4c083deacd9e4c7d3e6925404fb
Auto-generated-cl: translation import
2014-06-15 12:55:38 +00:00
Baligh Uddin
bae17706e4
Import translations. DO NOT MERGE
...
Change-Id: I106f4baf039e03ba6cd7b82c80c60b4f49dd4a7b
Auto-generated-cl: translation import
2014-06-15 12:55:21 +00:00
Baligh Uddin
4a66b07c7f
Import translations. DO NOT MERGE
...
Change-Id: If49c63f7cf5e95fcaba6852dfc44ed702ed625b9
Auto-generated-cl: translation import
2014-06-15 12:54:54 +00:00
Ihab Awad
647e2c6825
Merge "DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (1/4)"
2014-06-13 21:09:46 +00:00
Alan Viverette
30794097ac
Fix NPE in focus hotspot management
...
BUG: 15631051
Change-Id: I24b014f940c43a1f92fd050439bb6a42b8e24310
2014-06-14 12:23:51 -07:00
Ian Rogers
7cb5f9699b
am 7f8d94f4: Merge branch \'klp-modular-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp
...
* commit '7f8d94f4117021531a388cf2b382ec66d77a3c99':
docs: squashed commit of i.o launches
2014-06-14 09:44:21 +00:00
Nick Kralevich
6e3a1c2bb2
am 5f20e1ae: am 23315095: am 748f4b8d: Merge "update mLastSlash for gdbserver"
...
* commit '5f20e1ae8df262ac777944f00b685f0cf2fe4458':
update mLastSlash for gdbserver
2014-06-14 09:44:15 +00:00
Ihab Awad
c067754a85
DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (1/4)
...
Bug: 15275904
Bug: 15196474
Change-Id: If9aeae519047b221aa2c178d8d2903c4e2054a6d
2014-06-13 18:05:29 -07:00
Alan Viverette
a8e9529b73
Merge "Support hotspots in View drawables"
2014-06-13 21:09:46 +00:00
Alan Viverette
996ed45b0d
Fix bright foreground & hint colors
...
BUG: 15616463
Change-Id: I747a3fd30e701bd2ee40df5faf2688cd5af4ee14
2014-06-13 15:58:25 -07:00
Alan Viverette
cebc6bab51
Support hotspots in View drawables
...
BUG: 15285217
Change-Id: Iad44454fe16ac27ed20b9c17ae2df69649339eed
2014-06-13 15:52:13 -07:00
RoboErik
c92856c4bb
Merge "b/15330955 Make RemoteController use the new session APIs" into lmp-preview-dev
2014-06-11 23:10:23 +00:00
Robert Greenwalt
6ba62e6416
Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev
2014-06-11 21:23:31 +00:00
Robert Greenwalt
7569f1811f
Make NetworkCapabilities publicly immutable.
...
Applying API council comments.
bug: 15142362
(cherry picked from commit Ie0bde68b72656a676d90c0343b9756fe9268d8d6)
Change-Id: Ie0bde68b72656a676d90c0343b9756fe9268d8d6
2014-06-11 23:29:39 +00:00
Winson Chung
91b7d2b4fb
Merge "Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)" into lmp-preview-dev
2014-06-11 21:23:31 +00:00
Svetoslav
39f0882786
Merge "Fix NPE in PrintActivity."
2014-06-11 21:23:31 +00:00
Svetoslav
e3bbb3d6c0
Fix NPE in PrintActivity.
...
It is possible that the orientation is chosen before the media size.
The code handling orientation change was wrognly expecting to have
a selected media size all the time resulting in a NPE.
bug:15512333
Change-Id: I9f2786af314641144a24c1d1363c8d2590b0df57
2014-06-12 10:43:23 -07:00
Svetoslav
4604abc97d
Moving and resizing windows not reported propely for accessibility.
...
When the position and size of a window changes we have to report that
to the accessibility layer if the window introspection is enabled.
bug:15569915
Change-Id: I3f869e0a582592bfa5f3743d5c2133ee8cb39b34
2014-06-12 08:26:21 -07:00
Nicolas Prevot
006812acd2
am 485303e2: Merge "Correcting a bug related to Uri permissions." into lmp-preview-dev
...
* commit '485303e2e45ca91287400b0b26e1e737062c8839':
Correcting a bug related to Uri permissions.
2014-06-12 15:23:38 +00:00
John Reck
dea0f13683
am 82469fb2: (-s ours) Merge "DO NOT MERGE Disable AtlasInitializer" into lmp-preview-dev
...
* commit '82469fb2aa173e307c0c92ccdf9db30316502813':
DO NOT MERGE Disable AtlasInitializer
2014-06-12 15:23:32 +00:00
Mark Salyzyn
fe2fd536de
Merge "hwui: 64-bit compile issue"
2014-06-11 21:23:31 +00:00
Andy McFadden
564dae50b5
Merge "Delete a local ref in getSurface"
2014-06-12 03:30:50 +00:00
Andy McFadden
5ad3ab8a16
Delete a local ref in getSurface
...
ANativeWindow_fromSurface() provides a native-only call path to
android_view_Surface_getSurface(), so we need to clean up the
local reference.
Bug 14087233
Change-Id: I92aa5aa492c47a0642fdcb28c717ad7f874e1ad9
2014-06-11 15:22:32 -07:00
Winson Chung
8175a7c2e6
Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)
...
Change-Id: Ic04dc2ef73c75d63e107e7b50842dd618d3a173a
2014-06-11 14:19:53 -07:00
RoboErik
73e23e229d
b/15330955 Make RemoteController use the new session APIs
...
This moves RemoteController over to using Sessions instead of
the RCC/RCD framework. This also adds several hidden APIs to
help with translating between the two apis.
Change-Id: I0f50313db2b6190b16fa86ce670ac9250654ca05
2014-06-11 10:58:52 -07:00
Christopher Tate
f9fcfaae78
Merge "Relax duplicate-permission-definition constraints slightly" into lmp-preview-dev
2014-06-11 08:41:11 +00:00
Winson Chung
ec464ed728
Merge "Clipping the task bar against the task view."
2014-06-11 08:41:11 +00:00
Winson Chung
743d5c95f3
Clipping the task bar against the task view.
...
- Skipping nav bar scrim animation when animating without window transitions
Change-Id: I8652f3956971f07bb410b801bf627d51c5e987cd
2014-06-13 15:27:47 -07:00
Winson Chung
ad6f276670
Enabling Home->Recents transition.
2014-06-13 09:41:09 -07:00
Winson Chung
a26fb7822d
Fixing issues with dim not animating, adding dismiss button delay, tweaking empty recents text. (Bug 15431590, 15573497)
...
Change-Id: I9c11e04cd52f9e000d8ba3e443f2500c9aa7edbb
2014-06-12 19:08:29 -07:00
Winson Chung
9214eff52a
Fix regression in using visibility flags.
2014-06-12 13:59:25 -07:00
Winson Chung
d42a6cfe2b
Exploring transitions to/from Recents.
...
- refactored hwlayers and change view property animations to use a reference counted trigger
- cleaned up RecentsConfiguration, and move it into classes using it
- moved task bar animations back into TaskBarView
- refactoring enter/exit animations to use an animation context
Change-Id: Ia66b622b094f22145c2fab07c2a9bdfd62344be2
2014-06-12 12:57:56 -07:00
Ido Ofir
7bb38dbb3c
Merge "Adding permission for launching the trust agent settings."
2014-06-12 05:34:42 +00:00
Ido Ofir
29372ab484
Adding permission for launching the trust agent settings.
...
Change-Id: Iac5bde57ca8d465fdf0fa5848d6716fc88801aeb
2014-06-13 14:52:19 -07:00
Andrew Solovay
a0f0c783d0
am 79130d1d: am 81be9239: am bd8ca9f9: am 4737af8b: docs: Added "Verifying for ART" to TOC.
...
* commit '79130d1de32380f346a95d277dc8403b37ad97b9':
docs: Added "Verifying for ART" to TOC.
2014-06-13 21:50:33 +00:00
Qiwen Zhao
677d4ae6ea
Merge "Merge commit '0f3d3dd2'"
2014-06-13 21:09:46 +00:00
Qiwen Zhao
220cad6d97
Merge commit '0f3d3dd2'
...
Conflicts:
services/core/java/com/android/server/am/ActivityStack.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java
2014-06-13 14:43:51 -07:00
Zhijun He
0cb41fd5ad
Merge "Camera2: Add rollingShutterSkew tag"
2014-06-13 21:09:46 +00:00
Zhijun He
0bda31afe0
Camera2: Add rollingShutterSkew tag
...
Change-Id: Icbedaeda9fc64a9dda509493ad9d14569c56cd18
2014-06-13 14:38:39 -07:00
Baligh Uddin
e31d9438db
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
2014-06-12 21:07:47 +00:00
Baligh Uddin
0ce9237391
Import translations. DO NOT MERGE
...
Change-Id: Ic15fd186de8247f8a5cad5cce87218ebec6cd81e
Auto-generated-cl: translation import
2014-06-13 07:23:57 -07:00
Baligh Uddin
da8a64b80b
Import translations. DO NOT MERGE
...
Change-Id: Ibdd11bf4b5a0ebb0394400688dd0e38a70660a62
Auto-generated-cl: translation import
2014-06-13 07:20:46 -07:00
Eino-Ville Talvala
fb587f4f6b
Merge "camera2 docs: Fix instructions for using SurfaceView." into lmp-preview-dev
2014-06-12 17:09:07 +00:00
Eino-Ville Talvala
5ae1ca5b69
camera2 docs: Fix instructions for using SurfaceView.
...
Bug: 15597178
Change-Id: I802369e61725451ddd8df855c384608c80e12693
2014-06-12 17:02:17 -07:00
Sol Boucher
b8cee5175d
camera2: Remove stray </p> in CameraDevice#createCaptureSession
...
This was causing strange indentation.
The change also clarifies how to get the supported output sizes in the
ImageReader flow: Although the doc (correctly) instructed the developer to use
StreamConfigurationMap#getOutputSizes(int) with an ImageReader, this instruction
appeared after the bulleted list of output types. Since all other items in that
list specify that getOutputSizes(Class<?>) should be used, the reader shouldn't
be expected to read beyond the list only in this specific case.
Bug: 15574400
Change-Id: Id952b46ae52322d75abbcaffea678d5ba50b22a5
2014-06-12 17:39:11 +00:00
Ihab Awad
879d8b3308
Merge "DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (1/4)" into lmp-preview-dev
2014-06-12 17:09:07 +00:00
Fabrice Di Meglio
2b3818e9a8
Merge "Fix bug #15414236 Define a framework theme for system settings"
2014-06-11 08:41:11 +00:00
Fabrice Di Meglio
fb82d4837f
Fix bug #15414236 Define a framework theme for system settings
...
- add missing Material preferencePanelStyle / preferenceHeaderPanelStyle /
preferenceListStyle / preferenceFragmentListStyle / preferenceFragmentPaddingSide
- add needed material dimens
- fixed PreferenceFragment.Material
- done it for the normal and light theme
Change-Id: Ib25288a499ab6b1ee42b2d0c72a2e5a1be084e5f
2014-06-13 14:15:34 -07:00