summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fixing transition from tasks excluded from Recents into Recents."Winson Chung2014-04-222-7/+24
|\
| * Fixing transition from tasks excluded from Recents into Recents.Winson Chung2014-04-212-7/+24
| | | | | | | | Change-Id: I04efdd65bcda4d0111888a1c5651d1ec9b0c98b0
* | Merge "Add touch feedback to edit text"Alan Viverette2014-04-224-39/+61
|\ \
| * | Add touch feedback to edit textAlan Viverette2014-04-214-39/+61
| | | | | | | | | | | | Change-Id: Id25692bfa40f5145d6ca807111bbd5d0c4774d07
* | | Merge "Add overlay view in Tv Input Framework"Youngsang Cho2014-04-2210-29/+593
|\ \ \
| * | | Add overlay view in Tv Input FrameworkYoungsang Cho2014-04-1810-29/+593
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A TvInputService app developers sometimes want to draw UI above a surface playing TV. For this purpose, we add a window in TIS and allow developers to attach their customized view on the TV surface. Change-Id: I65c3dffa17580b8d4c42fac58bbfc8dad338c185
* | | | Merge "Initial implementation of NetworkScoreManager's backing service."Jeff Davidson2014-04-2213-20/+365
|\ \ \ \
| * | | | Initial implementation of NetworkScoreManager's backing service.Jeff Davidson2014-04-2113-20/+365
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This service will ultimately be responsible for propagating scores down to lower-level network subsystems. For now, it just keeps scores in memory and exposes these for debugging purposes via "adb shell dumpsys network_score". This change also adds provisioning of a default scorer. When NetworkScoreService is first initialized, it checks to see if it has ever set a default scorer; if not, it reads a package name from a build config property and attempts to set it as the default. Also add autogenerated equals/hashCode methods to all parcelables. Bug: 14111427 Bug: 13786258 Change-Id: I02271171653d42e12acd240b73b9e23950744f6b
* | | | | Merge "Make sure events handled on same looper"Robert Greenwalt2014-04-211-65/+99
|\ \ \ \ \
| * | | | | Make sure events handled on same looperRobert Greenwalt2014-04-211-65/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two handlers are used to call a function, but the init was not forcing them on the same looper/thread, so we could get synchronization problems as a result. Moved to a single looper. Also added finally clauses to clean up if a broadcast throws an uncaught exception. bug:13399768 Change-Id: I0044e2442335ee45a15588f910064e848cf6ac55
* | | | | | Merge "Overriding application icon with activity icon where available."Winson Chung2014-04-214-23/+16
|\ \ \ \ \ \
| * | | | | | Overriding application icon with activity icon where available.Winson Chung2014-04-214-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I03ee8f806b3853183db7f96e71f1684c72b79c57
* | | | | | | am e618f184: am 72eec7f6: Merge "Allow DRM plugins to be destroyed when ↵Jeff Tinker2014-04-212-2/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | released" into klp-modular-dev * commit 'e618f184733e745df4cf86019d23e085559e0f2c': Allow DRM plugins to be destroyed when released
| * \ \ \ \ \ \ am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into ↵Jeff Tinker2014-04-212-2/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '72eec7f6c9509fb86f46fbdb619523efacb8d02e': Allow DRM plugins to be destroyed when released
| | * \ \ \ \ \ \ Merge "Allow DRM plugins to be destroyed when released" into klp-modular-devJeff Tinker2014-04-212-2/+10
| | |\ \ \ \ \ \ \
| | | * | | | | | | Allow DRM plugins to be destroyed when releasedJeff Tinker2014-04-112-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 13411994 Change-Id: I5b4ac137ebfbaa61bc37f8344ab6ff3a7f6c0099
* | | | | | | | | | Merge "Try to always print time stamp in battery history."Dianne Hackborn2014-04-212-22/+62
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Try to always print time stamp in battery history.Dianne Hackborn2014-04-212-22/+62
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix printing of string pool to quote the strings and escape characters, and change history time stamps to print starting at 0 and going up. Change-Id: I2d0c080f2b5de7b27b20a7357c2c0cf481c82d8c
* | | | | | | | | | am a281be67: am 370cda70: Merge "Allow InputEvents to propagate w/o IME" ↵Adam Lesinski2014-04-211-1/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev * commit 'a281be67030a834d455a84ce62c173140564211a': Allow InputEvents to propagate w/o IME
| * | | | | | | | am 370cda70: Merge "Allow InputEvents to propagate w/o IME" into klp-modular-devAdam Lesinski2014-04-211-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '370cda7074a02139fa5374bbdd94c37be376ca7a': Allow InputEvents to propagate w/o IME
| | * | | | | | | Merge "Allow InputEvents to propagate w/o IME" into klp-modular-devAdam Lesinski2014-04-211-1/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Allow InputEvents to propagate w/o IMEAdam Lesinski2014-04-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no IME was present, InputEvents such as KeyEvents would simple be dropped instead of going through to the Activity's View hierarchy. Change-Id: I9de25bdbf5d1564b77b25679e19dae18591a8c1c
* | | | | | | | | | am 43cea7ea: am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set ↵Jesse Hall2014-04-211-2/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as ES 3 context is requested." * commit '43cea7eadbcb3930887eadfa3f278e1a666449d0': EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
| * | | | | | | | | am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 ↵Jesse Hall2014-04-211-2/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | context is requested." * commit '650a8860d9732accd938a32f99179cc86f101ef4': EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
| | * \ \ \ \ \ \ \ \ am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."Jesse Hall2014-04-211-2/+6
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc3c6a0ef36cc4969aa7d8e160cc55f30c653325': EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
| | | * \ \ \ \ \ \ \ \ Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."Jesse Hall2014-04-211-2/+6
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.Jin Zhebin2014-04-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenGL ES have 3 configuration: 1(EGL10.EGL_RENDERABLE_TYPE), 2(EGL_OPENGL_ES2_BIT), 3(EGL_OPENGL_ES3_BIT_KHR). The driver should be get the according configuration parameter. Now 1 is set to driver when Configuration 3 is set from user. Specification EGL_OPENGL_ES3_BIT_KHR is set to driver when a OpenGL ES 3 context is requested in setEGLContextClientVersion(). Change-Id: I980d9d8dbe5754295f8329fcf9378962d669fa89 Signed-off-by: Jin Zhebin <zhebinx.jin@intel.com> Signed-off-by: bdeng3X <bingx.deng@intel.com>
* | | | | | | | | | | | | Merge "BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG"Colin Cross2014-04-211-5/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSGColin Cross2014-04-181-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of requiring the kernel to join last_kmsg and the reboot reason together, allow both to be passed to userspace and have userspace combine them the way the log parsers want them. Existing devices with no ro.boot.bootreason property and kernel support for putting the reason in last_kmsg will continue to use the kernel's formatting. Bug: 13813279 Change-Id: I079b0107feb1533c6a54044ca6a114741127dfbc
* | | | | | | | | | | | | | Merge "Initial changes to add search bar."Winson Chung2014-04-2115-39/+242
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Initial changes to add search bar.Winson Chung2014-04-1715-39/+242
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Scaling touch overscroll Change-Id: Iee0523ca32efaae3491cbf5dbf3ea2e388f9d644
* | | | | | | | | | | | am 67881101: (-s ours) am fe755054: Merge "DO NOT MERGE Tear down PAN if ↵Ariel Gertzenstein2014-04-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we can\'t successfully complete a DHCP request after establishing a PANU connection." into klp-modular-dev * commit '6788110191fc457169d8268a4c25e1845d05ee07': DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.
| * | | | | | | | | | | am fe755054: Merge "DO NOT MERGE Tear down PAN if we can\'t successfully ↵Ariel Gertzenstein2014-04-211-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | complete a DHCP request after establishing a PANU connection." into klp-modular-dev * commit 'fe7550548d036b6c536840fd1daa954160d0b2c8': DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.
| | * | | | | | | | | | Merge "DO NOT MERGE Tear down PAN if we can't successfully complete a ↵Ariel Gertzenstein2014-04-211-0/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DHCP request after establishing a PANU connection." into klp-modular-dev
| | | * | | | | | | | | | DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP requestAriel Gertzenstein2014-04-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after establishing a PANU connection. http://b/13731957 Change-Id: I0c808d5196c66783b52942ba7b7212bdce9f1c07
* | | | | | | | | | | | | Merge "Avoid NPE when mRoot is null."Dan Sandler2014-04-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Avoid NPE when mRoot is null.Dan Sandler2014-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14162288 Change-Id: I36793d706ab1d29576f536562a0c06f7805a0d50
* | | | | | | | | | | | | am f82c83a8: am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f82c83a8debb468027921e4b479bf80fe7f04ee1': MTP: Fix getThumbnail
| * | | | | | | | | | | | am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eaabdce0ad556a91ccf731d042edfd9c5f249f5e': MTP: Fix getThumbnail
| | * | | | | | | | | | | am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ca1f8f6d14a144dde64112cd471df5e9539ad521': MTP: Fix getThumbnail
| | | * | | | | | | | | | am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c436772120ceea1d6e3f5b388ef068c99c8bb7d6': MTP: Fix getThumbnail
| | | | * | | | | | | | | | MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The thumbnail size was not being passed to the MTP stack so getThumbnail was returning zero length data. Bug: 13747419 Change-Id: I309d35b5c46ab5f631c0dcb5981f7896bb5a2ed5
* | | | | | | | | | | | | | am 717884ea: (-s ours) am 9df9ad7e: am 2a52862d: Merge "Use ↵Ying Wang2014-04-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | / / / / / / / / / | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOCAL_JNI_SHARED_LIBRARIES to install JNI libs." * commit '717884ea102e2ba7f4d35e25cc2486fd18e8a0d1': Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
| * | | | | | | | | | | | am 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install ↵Ying Wang2014-04-212-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JNI libs." * commit '9df9ad7e29aecf88fdeb026bda07963ab6789396': Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
| | * | | | | | | | | | | am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."Ying Wang2014-04-212-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2a52862db5257edcafa137276ce3d8dc54cd443e': Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
| | | * | | | | | | | | | Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."Ying Wang2014-04-192-2/+2
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.Ying Wang2014-04-182-2/+2
| | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibef01983891377b859d28cff801f48ef5d8eabb2
* | | | | | | | | | | | | Merge "Quick settings bug fixes."John Spurlock2014-04-213-19/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Quick settings bug fixes.John Spurlock2014-04-213-19/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix issue where notifications were positioned offscreen after quick screen toggle. - Better QS scrim hiding, use existing layout transition. - Don't allow a reposition if the settings animation is currently running. - Delay chevron animation during toggle to avoid drawing over each other. - Keep the screen on while the user is poking around with QS on the keyguard. - Cap the QS expansion to the bottom of the status view on keyguard. Change-Id: Ib63874d0c6a33db81923080f25cb8f208e614faf
* | | | | | | | | | | | | | Remove obsolete settings panel artifacts.John Spurlock2014-04-2114-444/+61
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't always have quick settings. But when I do, they live in a flip view, not a separate panel. Bug:14133785 Change-Id: I3df11d7de308a36a800eb7582a71e3febc897fec
generated by cgit v1.1 at 2025-02-10 07:20:05 +0000