git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Zhijun He [Tue, 6 May 2014 18:54:54 +0000 (11:54 -0700)]

Camera2: Add missing capture result tags

All capture request tags should be available in capture result.

Bug: 14059883
Change-Id: I0aa8d7341b14fbbd627b17eb316bb016ff1fc316

commit | commitdiff | tree

Tim Kilbourn [Tue, 6 May 2014 21:26:56 +0000 (21:26 +0000)]

am 1a556b99: (-s ours) am 17c5e990: Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev

* commit '1a556b996156b71bdbb60f6f9cd7bd3e16947a4f':
DO NOT MERGE Hide banner manifest attribute.

commit | commitdiff | tree

Tim Kilbourn [Tue, 6 May 2014 21:24:02 +0000 (21:24 +0000)]

am 17c5e990: Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev

* commit '17c5e990379baf887221c0776b4152613c2a8a2d':
DO NOT MERGE Hide banner manifest attribute.

commit | commitdiff | tree

Tim Kilbourn [Tue, 6 May 2014 21:21:36 +0000 (21:21 +0000)]

Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev

commit | commitdiff | tree

Dan Stoza [Tue, 6 May 2014 21:08:15 +0000 (21:08 +0000)]

Merge "Enable changing display configuration"

commit | commitdiff | tree

Jeff Brown [Tue, 6 May 2014 20:34:12 +0000 (20:34 +0000)]

am a93369a8: (-s ours) am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev

* commit 'a93369a819c9d4cfd4fe7ce3dd519f1c974bce4d':
Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)

commit | commitdiff | tree

Jeff Brown [Tue, 6 May 2014 20:30:49 +0000 (20:30 +0000)]

am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev

* commit '84aaf124b762b9eeb0957aaea9df8424a429b148':
Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)

commit | commitdiff | tree

Jeff Brown [Tue, 6 May 2014 20:28:35 +0000 (20:28 +0000)]

Merge "Plumb display state and interactive information to BatteryStats."

commit | commitdiff | tree

Jeff Brown [Tue, 6 May 2014 20:27:34 +0000 (20:27 +0000)]

Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev

commit | commitdiff | tree

Adam Powell [Tue, 6 May 2014 20:24:23 +0000 (20:24 +0000)]

am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev

* commit 'c41fa708271e204a7983aba291389ea1554227b2':
onWindowDismissed API cleanup

commit | commitdiff | tree

Jeff Brown [Fri, 2 May 2014 23:59:26 +0000 (16:59 -0700)]

Plumb display state and interactive information to BatteryStats.

Fixes an issue where dozing was treated the same as the screen
being fully on. Now dozing is treated the same as the screen
being fully off which is slightly better. The decision of how
to represent this state is now internal to the battery stats
so it can be improved later.

Removed noteInputEvent() since it is unused.

Bug: 14480844
Change-Id: Iee8cf8dce1a1f91c62678bb6d3d9fe567ad6db42

commit | commitdiff | tree

Adam Powell [Tue, 6 May 2014 20:20:40 +0000 (20:20 +0000)]

am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev

* commit 'a0516e7ad12a647cc40fb5651e8d14cd39571c7a':
onWindowDismissed API cleanup

commit | commitdiff | tree

Jeff Brown [Fri, 2 May 2014 23:59:26 +0000 (16:59 -0700)]

Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)

Fixes an issue where dozing was treated the same as the screen
being fully on. Now dozing is treated the same as the screen
being fully off which is slightly better. The decision of how
to represent this state is now internal to the battery stats
so it can be improved later.

Removed noteInputEvent() since it is unused.

Bug: 14480844
Change-Id: Iee8cf8dce1a1f91c62678bb6d3d9fe567ad6db42

commit | commitdiff | tree

Adam Powell [Tue, 6 May 2014 20:17:30 +0000 (20:17 +0000)]

Merge "onWindowDismissed API cleanup" into klp-modular-dev

commit | commitdiff | tree

Chris Craik [Tue, 6 May 2014 20:17:29 +0000 (20:17 +0000)]

Merge "Fix pivot update rejection logic"

commit | commitdiff | tree

Jorim Jaggi [Tue, 6 May 2014 20:01:42 +0000 (20:01 +0000)]

Merge "Never close Keyguard automatically."

commit | commitdiff | tree

Tim Kilbourn [Tue, 6 May 2014 18:59:55 +0000 (11:59 -0700)]

DO NOT MERGE Hide banner manifest attribute.

Bug: 14116162
Change-Id: I42a73183bee52286ff315fa5b0f58bfdfc020485

commit | commitdiff | tree

Dan Stoza [Fri, 2 May 2014 22:23:40 +0000 (15:23 -0700)]

Enable changing display configuration

This allows querying and switching display device configurations
through the ISurfaceComposer/SurfaceComposerClient interface.

Bug: 14320401
Change-Id: Ie4363bc8353d95428f1114ea48e5b1c8976e1730

commit | commitdiff | tree

Chris Craik [Tue, 6 May 2014 18:02:39 +0000 (11:02 -0700)]

Fix pivot update rejection logic

bug:14228573
Change-Id: Ia4c88f878ce325ee961117cf255c971d9947d5c6

commit | commitdiff | tree

Tim Kilbourn [Tue, 6 May 2014 17:54:00 +0000 (10:54 -0700)]

Fix bad merge.

Change-Id: I4d3aa71f5a4ae13c01e57df25ae7f76d25384f5d

commit | commitdiff | tree

Tim Kilbourn [Tue, 6 May 2014 17:46:02 +0000 (17:46 +0000)]

am f7330ac7: am 989dab11: Update current.txt after hiding isGame.

* commit 'f7330ac754d02089dedef5d7191bde9a75b91c2c':
Update current.txt after hiding isGame.

commit | commitdiff | tree

Tim Kilbourn [Tue, 6 May 2014 17:45:58 +0000 (17:45 +0000)]

am a7b267b8: (-s ours) am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute.

* commit 'a7b267b81b611058ddf7c268f5d21705f5306047':
DO NOT MERGE Hide isGame manifest attribute.

commit | commitdiff | tree

Tim Kilbourn [Tue, 6 May 2014 17:42:36 +0000 (17:42 +0000)]

am 989dab11: Update current.txt after hiding isGame.

* commit '989dab11d1e34d5f49ac19345a3ce440d32d6f64':
Update current.txt after hiding isGame.

commit | commitdiff | tree

Tim Kilbourn [Tue, 6 May 2014 17:42:31 +0000 (17:42 +0000)]

am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute.

* commit '0f3a98f5c93581cc511684b92e11e2ed2a17581e':
DO NOT MERGE Hide isGame manifest attribute.

commit | commitdiff | tree

Tim Kilbourn [Tue, 6 May 2014 17:40:24 +0000 (10:40 -0700)]

Update current.txt after hiding isGame.

Change-Id: I034126f464fdd759c19ff55000004d36463d9cd6

commit | commitdiff | tree

ztenghui [Tue, 6 May 2014 17:12:34 +0000 (17:12 +0000)]

Merge "First step on API cleaning on the VectorDrawable to disable animation support"

commit | commitdiff | tree

Tim Kilbourn [Mon, 5 May 2014 23:54:30 +0000 (16:54 -0700)]

DO NOT MERGE Hide isGame manifest attribute.

Bug: 14116162
Change-Id: I72a0210124f22009914a860097e286c5ea9af345

commit | commitdiff | tree

John Reck [Tue, 6 May 2014 16:17:13 +0000 (16:17 +0000)]

Merge "Implement loadSystemProperties"

commit | commitdiff | tree

Baligh Uddin [Tue, 6 May 2014 14:59:03 +0000 (14:59 +0000)]

am ddaacaa7: (-s ours) am 37c954c0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'ddaacaa7ceb6d41658eeea0079c9882510697dac':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 6 May 2014 14:54:27 +0000 (14:54 +0000)]

am 37c954c0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '37c954c044b28b708528c074e7172a1bd91521eb':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 6 May 2014 14:49:57 +0000 (14:49 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-modular-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 6 May 2014 14:49:52 +0000 (14:49 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Nicolas Prevot [Tue, 6 May 2014 13:57:56 +0000 (13:57 +0000)]

Merge "Cleaning code related to the forwarding intent filters."

commit | commitdiff | tree

Nicolas Prevot [Tue, 6 May 2014 13:55:59 +0000 (13:55 +0000)]

Merge "Introducing removable and non-removable ForwardingIntentFilters."

commit | commitdiff | tree

Jorim Jaggi [Tue, 6 May 2014 13:24:20 +0000 (13:24 +0000)]

Merge "Fix overly huge PanelView."

commit | commitdiff | tree

Nicolas Prevot [Tue, 6 May 2014 11:47:57 +0000 (12:47 +0100)]

Cleaning code related to the forwarding intent filters.

Checking for INTERACT_ACROSS_USERS_FULL
Adding equivalent methods in the PackageManager

Change-Id: Iaa1328fa666613a78e67ca669ea045144275e895

commit | commitdiff | tree

Jorim Jaggi [Tue, 6 May 2014 12:53:04 +0000 (14:53 +0200)]

Fix overly huge PanelView.

Bug: 14489968
Change-Id: Ibdc820348eb7d045ffb5ad07093ac86e5ff7abb0

commit | commitdiff | tree

Jorim Jaggi [Tue, 6 May 2014 12:10:52 +0000 (12:10 +0000)]

Merge "Implement phone affordance on lockscreen."

commit | commitdiff | tree

Jorim Jaggi [Fri, 2 May 2014 21:03:34 +0000 (23:03 +0200)]

Implement phone affordance on lockscreen.

Refactor the camera affordance into a reusable view. This change
also swaps the asset for the camera affordance.

Bug: 14488709
Change-Id: I0633614f6a1ea81faa37923f748af3c635e64a52

commit | commitdiff | tree

Nicolas Prevot [Thu, 1 May 2014 15:16:46 +0000 (16:16 +0100)]

Introducing removable and non-removable ForwardingIntentFilters.

clearForwardingIntentFilters removes only non-removable IntentFilters.
The ForwardingIntentFilters set by the profile owner are always removable.

Change-Id: If950ccd7e69261b86360ea647fdb501c92f5440b

commit | commitdiff | tree

Jesse Hall [Tue, 6 May 2014 04:00:38 +0000 (04:00 +0000)]

Merge "VirtualDisplayAdapter: Set the transaction surface even if NULL"

commit | commitdiff | tree

Elliott Hughes [Tue, 6 May 2014 02:34:40 +0000 (02:34 +0000)]

am 86768034: am b593ad60: am f1f28d1d: Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice."

* commit '867680342e12af59a26756f30cf817a131724943':
Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice.

commit | commitdiff | tree

Elliott Hughes [Tue, 6 May 2014 02:31:03 +0000 (02:31 +0000)]

am b593ad60: am f1f28d1d: Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice."

* commit 'b593ad60682a6f8c945c4c2ffc3d278df3f6e360':
Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice.

commit | commitdiff | tree

Elliott Hughes [Tue, 6 May 2014 02:27:44 +0000 (02:27 +0000)]

am f1f28d1d: Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice."

* commit 'f1f28d1d86aea6dd1419e94aadf051e433914680':
Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice.

commit | commitdiff | tree

Elliott Hughes [Tue, 6 May 2014 02:25:04 +0000 (02:25 +0000)]

Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice."

commit | commitdiff | tree

Yorke Lee [Tue, 6 May 2014 02:19:35 +0000 (02:19 +0000)]

Merge "Fix nested prescrolling bug in ScrollView"

commit | commitdiff | tree

Adam Powell [Tue, 6 May 2014 01:14:56 +0000 (18:14 -0700)]

onWindowDismissed API cleanup

Move the window swipe to dismiss plumbing off of Window.Callback into
its own internal interface implemented by Activity and Dialog. Make it
internal API instead of public. Apps should control this via the
window feature setting.

Change-Id: I64cd237fa7eab08719b2c34e31dac7d34f02563a

commit | commitdiff | tree

Igor Viarheichyk [Fri, 2 May 2014 00:04:39 +0000 (17:04 -0700)]

Skip resource files for locales en-XA and ar-XB
during packaging if pseudolocalization was done automatically.
This prevents attemts to add same resource twice.

Change-Id: I51e17f961ac44047bf466ce4aa0d4d17f4ded0d6

commit | commitdiff | tree

Selim Gurun [Tue, 6 May 2014 00:30:49 +0000 (00:30 +0000)]

Merge "Add frameworks/base changes for enabling reduction proxy"

commit | commitdiff | tree

Selim Gurun [Mon, 5 May 2014 22:59:39 +0000 (15:59 -0700)]

Add frameworks/base changes for enabling reduction proxy

Bug:12492817

Add an experimental webview setting to developer options to enable
data reduction proxy.

Change-Id: Id73d7f5d655a7de18afff766c5c78209c92964ea

commit | commitdiff | tree

ztenghui [Mon, 5 May 2014 23:26:22 +0000 (16:26 -0700)]

First step on API cleaning on the VectorDrawable to disable animation support

Cleaning on the API level, and related tests.
The animated icon will be only showing the initial state.

TODO: Deep clean on the functionality part and attributes.

Change-Id: I5723bc5b64f796c3a273d74bde02095751160a88

commit | commitdiff | tree

Justin Koh [Tue, 6 May 2014 00:11:20 +0000 (00:11 +0000)]

am f99fc540: (-s ours) am 34f930f3: Fix build due to docs bug. DO NOT MERGE

* commit 'f99fc5405ea909e8fdea3446646afd8b26229c18':
Fix build due to docs bug. DO NOT MERGE

commit | commitdiff | tree

Yohei Yukawa [Tue, 6 May 2014 00:10:11 +0000 (00:10 +0000)]

Merge "Take supportsSwitchingToNextInputMethod into considertaion"

commit | commitdiff | tree

Justin Koh [Tue, 6 May 2014 00:07:16 +0000 (00:07 +0000)]

am 9241a8d6: am 8031fa01: Fix build due to @deprecated tag not having content

* commit '9241a8d681397d5bacbae19cb081854ebed14d03':
Fix build due to @deprecated tag not having content

commit | commitdiff | tree

Justin Koh [Tue, 6 May 2014 00:06:58 +0000 (00:06 +0000)]

am 34f930f3: Fix build due to docs bug. DO NOT MERGE

* commit '34f930f3b591f08ee4be8c2f54ee602cabdacc33':
Fix build due to docs bug. DO NOT MERGE

commit | commitdiff | tree

Zhijun He [Tue, 6 May 2014 00:03:28 +0000 (00:03 +0000)]

Merge "Camera2: make videostabilization type consistent"

commit | commitdiff | tree

Justin Koh [Tue, 6 May 2014 00:03:04 +0000 (00:03 +0000)]

am 8031fa01: Fix build due to @deprecated tag not having content

* commit '8031fa014cd9f8bb9eb7de47b76a732cdfade687':
Fix build due to @deprecated tag not having content

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 23:58:24 +0000 (16:58 -0700)]

Fix build due to docs bug. DO NOT MERGE

Fix build due to docs bug: needed to remove reference to stopMethodTracingSampling.

Change-Id: I878357b638b3862aecb4bc9d32ee166840b6c796

commit | commitdiff | tree

Winson Chung [Mon, 5 May 2014 23:59:29 +0000 (23:59 +0000)]

Merge "Exposing the API to support widgets in Recents."

commit | commitdiff | tree

John Reck [Mon, 5 May 2014 23:39:37 +0000 (16:39 -0700)]

Implement loadSystemProperties

Bug: 14087580

Change-Id: I7153f38c70b554a78c56a0e794da929fc401ee7a

commit | commitdiff | tree

Jesse Hall [Mon, 5 May 2014 23:09:32 +0000 (16:09 -0700)]

VirtualDisplayAdapter: Set the transaction surface even if NULL

Bug: 14299872
Change-Id: I55e4a2e575cfd3788fbdb90b050dac486976c1b6

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 23:37:20 +0000 (23:37 +0000)]

am 8b98c213: (-s ours) am bebfcb93: Merge "Hide startMethodTracingSampling DO NOT MERGE" into klp-modular-dev

* commit '8b98c2130730b64917da0e0dbfb7e9202272f4f1':
Hide startMethodTracingSampling DO NOT MERGE

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 23:37:16 +0000 (23:37 +0000)]

am 7b529fcd: (-s ours) am 268f858b: Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev

* commit '7b529fcd6dc9064f5cbc2db95f9ac08bd59b0953':
Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 23:37:11 +0000 (23:37 +0000)]

am e0cc71fa: (-s ours) am 1440cc6b: Merge "Hide InputDevice#supportsSource DO NOT MERGE" into klp-modular-dev

* commit 'e0cc71fa19706dee06b1ef17dec720e420753162':
Hide InputDevice#supportsSource DO NOT MERGE

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 23:28:49 +0000 (16:28 -0700)]

Fix build due to @deprecated tag not having content

Bug: 14441321
Change-Id: Ia42040db7030e4318ed2c34bbe90808a49f002db

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 23:18:26 +0000 (23:18 +0000)]

am bebfcb93: Merge "Hide startMethodTracingSampling DO NOT MERGE" into klp-modular-dev

* commit 'bebfcb93ef97095a7caa1f80a0b1b05a04e9fd8c':
Hide startMethodTracingSampling DO NOT MERGE

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 23:18:22 +0000 (23:18 +0000)]

am 268f858b: Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev

* commit '268f858be57089e568bc55aa9089af54a53dcc94':
Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 23:15:36 +0000 (23:15 +0000)]

Merge "Hide startMethodTracingSampling DO NOT MERGE" into klp-modular-dev

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 23:14:06 +0000 (23:14 +0000)]

Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 23:11:03 +0000 (23:11 +0000)]

am 1440cc6b: Merge "Hide InputDevice#supportsSource DO NOT MERGE" into klp-modular-dev

* commit '1440cc6bf37a268b439dfe86a9078b93bf1baf39':
Hide InputDevice#supportsSource DO NOT MERGE

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 23:08:38 +0000 (16:08 -0700)]

Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE

Bug: 14116162
Change-Id: I6b947c9b46bb5ea094b39428bb432e8f6fc6b57a

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 23:08:14 +0000 (23:08 +0000)]

Merge "Hide InputDevice#supportsSource DO NOT MERGE" into klp-modular-dev

commit | commitdiff | tree

Griff Hazen [Mon, 5 May 2014 22:53:59 +0000 (22:53 +0000)]

am 36ef0792: (-s ours) am ed0c87e7: DO NOT MERGE Hide Notification categories from API 20 (KKWT)

* commit '36ef0792d28d2beb8eecb4547fab81d520c66ed0':
DO NOT MERGE Hide Notification categories from API 20 (KKWT)

commit | commitdiff | tree

Griff Hazen [Mon, 5 May 2014 22:49:51 +0000 (22:49 +0000)]

am ed0c87e7: DO NOT MERGE Hide Notification categories from API 20 (KKWT)

* commit 'ed0c87e7cdd2f641b6ed78df62b20a9f08ac16bb':
DO NOT MERGE Hide Notification categories from API 20 (KKWT)

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:47:39 +0000 (15:47 -0700)]

Hide InputDevice#supportsSource DO NOT MERGE

Bug: 14116162
Change-Id: I7c0ae516596f965083622aa77281abf6d47dc0b7

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:45:36 +0000 (22:45 +0000)]

am fcd2aff4: (-s ours) am 1e822a8f: Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-dev

* commit 'fcd2aff48d06ff695a14359621c6dba4ae5366de':
Hide HDMI CEC from KKWT DO NOT MERGE

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:45:32 +0000 (22:45 +0000)]

am 8e4cbcce: (-s ours) am f8a10d77: Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev

* commit '8e4cbcce6616aee96754393aaddb23df91bfc02c':
Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:45:29 +0000 (22:45 +0000)]

am 5aa34455: (-s ours) am 9cb3b162: Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev

* commit '5aa34455d7d921f33b67463cd58b879d5cfcf1ca':
Hide UsbDevice changes in KKWT DO NOT MERGE

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:45:23 +0000 (22:45 +0000)]

am fd04632a: am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev

* commit 'fd04632ab5fe9272b0f1d2ff94367a574e026a5b':
Hide getDeviceGlobalActionKeyTimeout

commit | commitdiff | tree

Griff Hazen [Mon, 5 May 2014 22:15:12 +0000 (15:15 -0700)]

DO NOT MERGE Hide Notification categories from API 20 (KKWT)

Bug: 14116162

Change-Id: I59e499dde9a06a4bf455eecb3665afaa1b574dae

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:42:22 +0000 (22:42 +0000)]

am 1e822a8f: Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-dev

* commit '1e822a8fe1f3063aa0d3eb47a7afdda9702c1734':
Hide HDMI CEC from KKWT DO NOT MERGE

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:42:19 +0000 (22:42 +0000)]

am f8a10d77: Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev

* commit 'f8a10d775efcc1c7255c1e504bf59f7cd38967ef':
Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:42:15 +0000 (22:42 +0000)]

am 9cb3b162: Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev

* commit '9cb3b162ebf2c85b2b34d399623ff68427b2cdca':
Hide UsbDevice changes in KKWT DO NOT MERGE

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:39:19 +0000 (15:39 -0700)]

Hide startMethodTracingSampling DO NOT MERGE

Bug: 14116162
Change-Id: I68470f02a2b6c2f0d9a1cb52bb4b7eeea10b43cf

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:38:26 +0000 (22:38 +0000)]

Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-dev

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:38:16 +0000 (22:38 +0000)]

Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:38:13 +0000 (22:38 +0000)]

am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev

* commit '3caf92582498bad8fe79f6e3235be218e82b7f68':
Hide getDeviceGlobalActionKeyTimeout

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:38:06 +0000 (22:38 +0000)]

Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:33:28 +0000 (22:33 +0000)]

Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:24:46 +0000 (22:24 +0000)]

am 68ca1464: (-s ours) am ed23c5bc: Hide NsdServiceInfo additions for KKWT DO NOT MERGE

* commit '68ca14648c88d84080cafae02c9bc5cf3448096a':
Hide NsdServiceInfo additions for KKWT DO NOT MERGE

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:21:03 +0000 (22:21 +0000)]

am ed23c5bc: Hide NsdServiceInfo additions for KKWT DO NOT MERGE

* commit 'ed23c5bc12b4110435b1e6f5fb9b82716109136e':
Hide NsdServiceInfo additions for KKWT DO NOT MERGE

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 21:26:44 +0000 (14:26 -0700)]

Hide HDMI CEC from KKWT DO NOT MERGE

Hide HDMI CEC from KKWT.
Bug: 14116162

Change-Id: I086a5e51bd848a5097ccb0c47900fde30db2e7aa

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 21:56:58 +0000 (14:56 -0700)]

Hide UsbDevice changes in KKWT DO NOT MERGE

Hide UsbDevice changes in KKWT.
Bug: 14116162

Change-Id: I1582b9d536b243fa18beca6fdd8f379f9e32e137

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 22:12:31 +0000 (15:12 -0700)]

Hide NsdServiceInfo additions for KKWT DO NOT MERGE

Hide NsdServiceInfo additions for KKWT.
Bug: 14116162

Change-Id: I98755a2524168be5e833a634192fd49ff3c32346

commit | commitdiff | tree

Alan Viverette [Mon, 5 May 2014 22:05:54 +0000 (22:05 +0000)]

Merge "Add support for popups overlapping anchors"

commit | commitdiff | tree

Chris Craik [Mon, 5 May 2014 21:53:56 +0000 (21:53 +0000)]

am 3cb74d21: am 5d8343b8: am a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init fail"

* commit '3cb74d21b2ac2427e805f72a113e8d7a2cc460f3':
libhwui: Handle the blurImage() implement once RS::init fail

commit | commitdiff | tree

Justin Koh [Mon, 5 May 2014 21:51:55 +0000 (14:51 -0700)]

Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE

Hide getRequiredPermission in android.hardware.Sensor.
Bug: 14116162

Change-Id: I1e5c8361f6d0710c5da78d9506f70fa40a814b92

commit | commitdiff | tree

Chris Craik [Mon, 5 May 2014 21:50:34 +0000 (21:50 +0000)]

am 5d8343b8: am a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init fail"

* commit '5d8343b8e27e766b5bfaaed2f9b1952c0d15da8d':
libhwui: Handle the blurImage() implement once RS::init fail

commit | commitdiff | tree

Chris Craik [Mon, 5 May 2014 21:46:48 +0000 (21:46 +0000)]

am a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init fail"

* commit 'a85db5ab785c59726c3644999801e48f449714f3':
libhwui: Handle the blurImage() implement once RS::init fail

commit | commitdiff | tree

Chris Craik [Mon, 5 May 2014 21:44:08 +0000 (21:44 +0000)]

Merge "libhwui: Handle the blurImage() implement once RS::init fail"

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help