OSDN Git Service
Deepanshu Gupta [Wed, 16 Apr 2014 19:14:34 +0000 (12:14 -0700)]
resolved conflicts for merge of
ec6676dd to klp-modular-dev-plus-aosp
Change-Id: I2fec735ba65f56da7d17022074f8924a259b4bbf
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:23 +0000 (18:43 +0000)]
am
e5d0fce7: am
685b7d41: am
1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '
e5d0fce7aeb60c44849cd09815ccecda702422ef':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:55 +0000 (18:40 +0000)]
am
86384880: am
f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
863848808d005fe1d2fd84a2982adfc02a3fbb9f':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:51 +0000 (18:40 +0000)]
am
685b7d41: am
1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '
685b7d4165c417ce20b1f6c49190eabcfda09940':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:39:25 +0000 (18:39 +0000)]
am
d023360a: am
484c88c3: am
4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '
d023360aa03db1a7831a5697d49faa2575e4a9c3':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:39:21 +0000 (18:39 +0000)]
am
2aee0712: am
e75477cb: am
acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE]
* commit '
2aee07124cad720587a8c51de5650b6b93ae9150':
Support custom views using TimePickerDialog [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:37:10 +0000 (18:37 +0000)]
am
f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
f1e7187645f0b0388f7b97d742395efd228b347a':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:37:06 +0000 (18:37 +0000)]
am
1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '
1b87390c9426c4bc9119829e9375d712dfde11c3':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:46 +0000 (18:36 +0000)]
am
484c88c3: am
4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '
484c88c3655991759dc64276404d0cf7e33b455f':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:40 +0000 (18:36 +0000)]
am
e75477cb: am
acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE]
* commit '
e75477cb3bf0f2e18c1f0bb743a6189fbc07c2a2':
Support custom views using TimePickerDialog [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:33:00 +0000 (18:33 +0000)]
am
4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '
4ccc4bd54f85d86818f61d728c6361d2003ddd8e':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:32:55 +0000 (18:32 +0000)]
am
acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE]
* commit '
acf0bce09fec2cabe871d7146aa62e9258fbf06d':
Support custom views using TimePickerDialog [DO NOT MERGE]
Baligh Uddin [Wed, 16 Apr 2014 15:31:02 +0000 (15:31 +0000)]
am
f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
f104f676e375c5c53eb049705740ab592b914bda':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 16 Apr 2014 15:28:28 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Deepanshu Gupta [Wed, 12 Mar 2014 01:02:44 +0000 (18:02 -0700)]
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit
bfec73c2db5a34ced248213edf5519c80727a65f)
Conflicts:
core/java/android/content/res/Resources.java
tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
Deepanshu Gupta [Thu, 13 Feb 2014 01:37:46 +0000 (17:37 -0800)]
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Adds MenuBuilderAccessor in addition to the cherry-picked changes.
Change-Id: Ib7cc314079099c010f7d53849e204db36c410357
(cherry-picked from commit
929eea6bc1824bf98d244550c0984ecf8ea98811)
Deepanshu Gupta [Thu, 12 Dec 2013 20:16:24 +0000 (12:16 -0800)]
Action bar rendering in layoutlib [DO NOT MERGE]
This also makes a couple of changes to the framework:
1. ShareActionProvider - Use edit mode to execute activity chooser code.
2. ActionBarImpl - add a new constructor for use by layoutlib.
This also relies on some changes to the plugin to pass the correct params.
Change-Id: Ia30fef816afd91ec1e439734d56b59b1323bfee2
(cherry-picked from
14bf0cef7eeed572a67c29a328581afac4decc20)
Deepanshu Gupta [Wed, 9 Apr 2014 22:14:37 +0000 (15:14 -0700)]
Support custom views using TimePickerDialog [DO NOT MERGE]
Bug: http://b.android/com/61515
Change-Id: I0dc3357be0c058adde9d3ea5b6796004b786fd34
(cherry picked from commit
86e5218220a0e01f7eb574a2480bd91f9ebfae35)
Vinod Krishnan [Tue, 15 Apr 2014 23:48:24 +0000 (23:48 +0000)]
am
56a90cb8: Merge "Set wearable specific strings in framework" into klp-modular-dev
* commit '
56a90cb8e1a136d6367c0006bf8689fcc97211cb':
Set wearable specific strings in framework
Vinod Krishnan [Tue, 15 Apr 2014 23:45:26 +0000 (23:45 +0000)]
Merge "Set wearable specific strings in framework" into klp-modular-dev
Dmitriy Ivanov [Tue, 15 Apr 2014 19:26:34 +0000 (19:26 +0000)]
am
6ced3b34: am
0d54e471: Merge "Remove code markers"
* commit '
6ced3b34f02f353c0d3445775132aa9cbf40b160':
Remove code markers
Dmitriy Ivanov [Tue, 15 Apr 2014 19:23:20 +0000 (19:23 +0000)]
am
0d54e471: Merge "Remove code markers"
* commit '
0d54e471fa90c2759e86dc47c642f7af277a50f0':
Remove code markers
Dmitriy Ivanov [Tue, 15 Apr 2014 19:19:53 +0000 (19:19 +0000)]
Merge "Remove code markers"
Dmitriy Ivanov [Tue, 15 Apr 2014 15:30:57 +0000 (08:30 -0700)]
Remove code markers
Change-Id: I2defbdeddca39685194751022e6dcb5f1a48a0e9
quddusc [Tue, 15 Apr 2014 18:34:31 +0000 (18:34 +0000)]
am
7ba3b3f4: am
fe0996b7: am
60095240: docs: Updated the gradle build number to 4.3.23. Bug:
14043082
* commit '
7ba3b3f4c87d891a2e8b55f68efd169392ff62af':
docs: Updated the gradle build number to 4.3.23. Bug:
14043082
Katie McCormick [Tue, 15 Apr 2014 18:34:27 +0000 (18:34 +0000)]
am
76b66a9a: am
2b4d89b7: am
eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs
* commit '
76b66a9ae7a894dd30a3bab56dedb537a904157b':
Doc change: Update CCS doc with new quota info.
quddusc [Tue, 15 Apr 2014 18:29:05 +0000 (18:29 +0000)]
am
fe0996b7: am
60095240: docs: Updated the gradle build number to 4.3.23. Bug:
14043082
* commit '
fe0996b7c09606fab0c1645d6c329cadf4d82841':
docs: Updated the gradle build number to 4.3.23. Bug:
14043082
Katie McCormick [Tue, 15 Apr 2014 18:28:59 +0000 (18:28 +0000)]
am
2b4d89b7: am
eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs
* commit '
2b4d89b7dcea13140b64e887b2a36042e8d491e9':
Doc change: Update CCS doc with new quota info.
Adam Powell [Tue, 15 Apr 2014 17:57:46 +0000 (17:57 +0000)]
am
50d7bfd8: DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views
* commit '
50d7bfd8224f9da170dac668888bcf0831373051':
DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views
Adam Powell [Mon, 3 Feb 2014 18:16:49 +0000 (10:16 -0800)]
DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views
Applying insets is now handled by:
* WindowInsets class - Encapsulate system insets and local decor
insets into a single object, written specifically so that new inset
categories may be added later. Apps cannot construct their own
WindowInsets, only clone with optional modifications. This is to
prevent losing data in the event of new insets added in the future.
* onApplyWindowInsets - Actually perform the application of insets.
* OnApplyWindowInsetsListener - Allow an app to use a separate
Listener object to apply insets to a View. This allows for things
like support lib integration in custom views written for older
versions where the verifier would otherwise complain about the use
of the new WindowInsets class as a method parameter. It also allows
for applying insets in a custom way without writing a custom view.
* dispatchApplyWindowInsets - Dispatch the call to self and children
in turn, if applicable. An OnApplyWindowInsetsListener will override
the behavior of the view's default onApplyWindowInsets method; a
listener wishing to call down to the 'superclass' implementation as
part of its own operation should call view.onApplyWindowInsets. App
code should generally not override this method and instead override
onApplyWindowInsets or provide a listener.
Compatibility support with the existing fitSystemWindows method has
been provided in both directions: for code that previously called
fitSystemWindows on arbitrary views and also for code that overrode
the fitSystemWindows method in custom views. A view that supports the
newer onApplyWindowInsets mechanism should not mix that behavior with
other calls to fitSystemWindows or vice versa. Support lib-style code
should take care to consistently use one mechanism or the other at
runtime.
Change-Id: Ie88b96e0382beb5d3c3f6cd013f7043acbc0a105
quddusc [Tue, 15 Apr 2014 17:12:03 +0000 (17:12 +0000)]
am
60095240: docs: Updated the gradle build number to 4.3.23. Bug:
14043082
* commit '
60095240e2a1b1c96ee4caf6cd7e9e1fa38acbb8':
docs: Updated the gradle build number to 4.3.23. Bug:
14043082
quddusc [Tue, 15 Apr 2014 01:14:22 +0000 (18:14 -0700)]
docs: Updated the gradle build number to 4.3.23.
Bug:
14043082
Change-Id: I8068f34b2533631b16dbaeaae3a0465088cc5aaf
Katie McCormick [Tue, 15 Apr 2014 16:55:32 +0000 (16:55 +0000)]
am
eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs
* commit '
eca07bfaaf89d5c0280dbc44b165ee1e3ca13498':
Doc change: Update CCS doc with new quota info.
Katie McCormick [Tue, 15 Apr 2014 16:52:44 +0000 (16:52 +0000)]
Merge "Doc change: Update CCS doc with new quota info." into klp-docs
quddusc [Mon, 14 Apr 2014 22:56:44 +0000 (22:56 +0000)]
am
66e99c46: am
0bd51600: am
41fb2be0: docs: Updated name of API to "Google Maps Android API v2". Bug:
13666553
* commit '
66e99c46546bf34fb8806dbefdbd71df1d41c814':
docs: Updated name of API to "Google Maps Android API v2". Bug:
13666553
quddusc [Mon, 14 Apr 2014 22:51:45 +0000 (22:51 +0000)]
am
0bd51600: am
41fb2be0: docs: Updated name of API to "Google Maps Android API v2". Bug:
13666553
* commit '
0bd516001988517aade19feb087de5cb03820805':
docs: Updated name of API to "Google Maps Android API v2". Bug:
13666553
quddusc [Mon, 14 Apr 2014 22:47:51 +0000 (22:47 +0000)]
am
41fb2be0: docs: Updated name of API to "Google Maps Android API v2". Bug:
13666553
* commit '
41fb2be0f2cb0f1a09b05f475ebb89fe4d975a68':
docs: Updated name of API to "Google Maps Android API v2". Bug:
13666553
Katie McCormick [Fri, 17 Jan 2014 21:06:12 +0000 (13:06 -0800)]
Doc change: Update CCS doc with new quota info.
Fix for:
b/
12665669
Change-Id: I08f812d37ab6f4347f6401b3a9682c45d96adb81
Christopher Lane [Mon, 14 Apr 2014 21:16:27 +0000 (21:16 +0000)]
am
62538940: Merge "Add support for custom TXT records in NSD" into klp-modular-dev
* commit '
62538940de1755c71c56b0e5d81e12397e5de58a':
Add support for custom TXT records in NSD
Christopher Lane [Mon, 14 Apr 2014 21:13:08 +0000 (21:13 +0000)]
Merge "Add support for custom TXT records in NSD" into klp-modular-dev
Christopher Lane [Mon, 17 Mar 2014 23:35:45 +0000 (16:35 -0700)]
Add support for custom TXT records in NSD
Change-Id: I8e6dc9852ad4d273c71ad6a63a7fbd28a206806d
Raph Levien [Mon, 14 Apr 2014 19:30:22 +0000 (19:30 +0000)]
am
202d1ec7: Fix text shadow attributes in textAppearance
* commit '
202d1ec753ff9401f3a1ea93a09a7419e76b7f91':
Fix text shadow attributes in textAppearance
quddusc [Mon, 14 Apr 2014 18:31:29 +0000 (11:31 -0700)]
docs: Updated name of API to "Google Maps Android API v2".
Bug:
13666553
Change-Id: I6de26da064fcda4a64e29d35c7d75140c5a4e048
Raph Levien [Mon, 14 Apr 2014 18:20:22 +0000 (11:20 -0700)]
Fix text shadow attributes in textAppearance
The various text shadow attributes were not being properly applied
because they were being retrieved from the wrong TypedArray.
This is the proper fix for bug
13525033 Shadow* attributes in a style
not being applied in textAppearance.
Change-Id: I57a8f498bf6059c5c5c74c1072edb277a24ea053
Baligh Uddin [Mon, 14 Apr 2014 17:06:45 +0000 (10:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I06501e9574457274ef7b0a3951a1d76b8c50fdac
Auto-generated-cl: translation import
Narayan Kamath [Mon, 14 Apr 2014 08:46:17 +0000 (08:46 +0000)]
am
549ae327: am
aa19a2f6: Merge "Don\'t compare String8s to NULL."
* commit '
549ae327245a844862065dc9bb0562544e8c3beb':
Don't compare String8s to NULL.
Narayan Kamath [Mon, 14 Apr 2014 08:41:42 +0000 (08:41 +0000)]
am
aa19a2f6: Merge "Don\'t compare String8s to NULL."
* commit '
aa19a2f69c33fdb6499d0bc1cfafced9f572da5b':
Don't compare String8s to NULL.
Narayan Kamath [Mon, 14 Apr 2014 08:18:24 +0000 (08:18 +0000)]
Merge "Don't compare String8s to NULL."
Narayan Kamath [Sat, 12 Apr 2014 11:25:50 +0000 (12:25 +0100)]
Don't compare String8s to NULL.
Use String8::isEmpty instead. Note that this code path is hit
only if the zygote calls ::exit, and that never happens unless
the VM invocation fails.
Change-Id: I0e7d3a86a79b12b2174ca3bf0dbe1904e33c041a
Jeff Brown [Sat, 12 Apr 2014 08:22:06 +0000 (08:22 +0000)]
am
a5c8d586: Fix build break due to layout lib.
* commit '
a5c8d586f6ceff252336f72c6e15efbf4785e794':
Fix build break due to layout lib.
Jeff Brown [Sat, 12 Apr 2014 05:09:06 +0000 (22:09 -0700)]
Fix build break due to layout lib.
Change-Id: I87b40125adad0a799214f6ebf0dc04ec7903efbf
Deepanshu Gupta [Sat, 12 Apr 2014 02:30:31 +0000 (02:30 +0000)]
am
e2dc6985: am
f1334ccc: am
849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]
* commit '
e2dc69856879d41798545b2c113098195bf04fa6':
Add DatePickerDialog to layoutlib [DO NOT MERGE]
Deepanshu Gupta [Sat, 12 Apr 2014 02:26:09 +0000 (02:26 +0000)]
am
f1334ccc: am
849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]
* commit '
f1334ccc1522241c0efc2449ed8bf472a5b01204':
Add DatePickerDialog to layoutlib [DO NOT MERGE]
Deepanshu Gupta [Sat, 12 Apr 2014 02:23:04 +0000 (02:23 +0000)]
am
849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]
* commit '
849a8208c88d38e55ec13a1fa76bf295fde96cb5':
Add DatePickerDialog to layoutlib [DO NOT MERGE]
Jeff Brown [Sat, 12 Apr 2014 01:58:57 +0000 (01:58 +0000)]
am
d912e1f6: Use the display\'s actual state in the view hierarchy.
* commit '
d912e1f6a111fb33118d116bd72da1a328041bca':
Use the display's actual state in the view hierarchy.
Jeff Brown [Sat, 12 Apr 2014 01:46:22 +0000 (18:46 -0700)]
Use the display's actual state in the view hierarchy.
Previously, the view hierarchy would suppress drawing whenever the
PowerManager.isScreenOn() method returned false. However, this method
really describes the interactive state of the device rather than the
actual display state. This is especially a problem when there are
multiple displays but it also breaks drawing while in doze mode.
This change makes the view hierarchy consider the actual state of the
display instead on an individual basis.
Bug:
13133142
Change-Id: I69870b6b14a3504607a30562aa48c3452f777c1f
Aravind Akella [Fri, 11 Apr 2014 19:34:51 +0000 (19:34 +0000)]
am
cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
* commit '
cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
Aravind Akella [Fri, 11 Apr 2014 19:32:38 +0000 (19:32 +0000)]
Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
Jose Lima [Fri, 11 Apr 2014 18:58:43 +0000 (18:58 +0000)]
am
970417c7: Added getLeanbackLaunchIntentForPackage()
* commit '
970417c7d3e33ccbd6918e28d9bc5da24651f5b3':
Added getLeanbackLaunchIntentForPackage()
Narayan Kamath [Fri, 11 Apr 2014 18:36:32 +0000 (18:36 +0000)]
am
97953b30: am
4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
* commit '
97953b308f9159a73061ae047e368eac503c1931':
Workaround 64 bit devices that don't have zygotes yet.
Narayan Kamath [Fri, 11 Apr 2014 18:33:00 +0000 (18:33 +0000)]
am
4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
* commit '
4f4892d00aab13975a8aed000f84ae0320355fd7':
Workaround 64 bit devices that don't have zygotes yet.
Narayan Kamath [Fri, 11 Apr 2014 18:29:54 +0000 (18:29 +0000)]
Merge "Workaround 64 bit devices that don't have zygotes yet."
Narayan Kamath [Fri, 11 Apr 2014 17:44:31 +0000 (18:44 +0100)]
Workaround 64 bit devices that don't have zygotes yet.
This can be fixed by tweaking their BoardConfig as well,
but that leads to all sorts of other problems.
For now, fall back to the primary zygote if the secondary
is unavailable. This will fail if shared libraries for the
primary zygote ABI are unavailable, but that won't be the
case just yet.
bug:
13970103
Change-Id: Ifa107e43ca95023d57a0d9c641e4fddaccd9a888
Vinod Krishnan [Thu, 10 Apr 2014 23:15:44 +0000 (16:15 -0700)]
Set wearable specific strings in framework
Change-Id: I81e7d55c53809199a340c9c16070b55ffbaeefc0
Jose Lima [Thu, 10 Apr 2014 17:42:19 +0000 (10:42 -0700)]
Added getLeanbackLaunchIntentForPackage()
Change-Id: I23be3bfa59be812a915adc37e08fdf59be8ad90f
Elliott Hughes [Fri, 11 Apr 2014 17:44:51 +0000 (17:44 +0000)]
am
70bba904: am
b093e485: Merge "generateProjectThumbnail can fail to close output stream"
* commit '
70bba904fc50f44cb4a695cf76e423534c835cf6':
generateProjectThumbnail can fail to close output stream
Elliott Hughes [Fri, 11 Apr 2014 17:41:44 +0000 (17:41 +0000)]
am
b093e485: Merge "generateProjectThumbnail can fail to close output stream"
* commit '
b093e485bbd790cc4d9678451c8cce4d361c2cf2':
generateProjectThumbnail can fail to close output stream
Elliott Hughes [Fri, 11 Apr 2014 17:37:54 +0000 (17:37 +0000)]
Merge "generateProjectThumbnail can fail to close output stream"
Elliott Hughes [Fri, 11 Apr 2014 17:37:18 +0000 (17:37 +0000)]
am
1ea1857d: am
8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter"
* commit '
1ea1857de9c98199015f0188678a12a82a6248d4':
Add additional languages to be accepted by the NumberPicker input filter
Elliott Hughes [Fri, 11 Apr 2014 17:33:15 +0000 (17:33 +0000)]
am
8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter"
* commit '
8cd319b84635454746803b0eed7e2626d7945a09':
Add additional languages to be accepted by the NumberPicker input filter
Elliott Hughes [Fri, 11 Apr 2014 17:30:09 +0000 (17:30 +0000)]
Merge "Add additional languages to be accepted by the NumberPicker input filter"
Elliott Hughes [Fri, 11 Apr 2014 17:21:20 +0000 (17:21 +0000)]
am
90e2301e: am
d2a11d97: Merge "Add explicit close of Scanner input"
* commit '
90e2301e23532c92dd4c24394b7407e243389e9f':
Add explicit close of Scanner input
Elliott Hughes [Fri, 11 Apr 2014 17:18:14 +0000 (17:18 +0000)]
am
d2a11d97: Merge "Add explicit close of Scanner input"
* commit '
d2a11d97a94bed18629bded429f118f57f4f7821':
Add explicit close of Scanner input
Elliott Hughes [Fri, 11 Apr 2014 17:14:39 +0000 (17:14 +0000)]
Merge "Add explicit close of Scanner input"
Ricardo Cervera [Fri, 11 Apr 2014 16:19:09 +0000 (16:19 +0000)]
am
3d9a3b58: am
7abc67f4: am
2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147" into klp-docs
* commit '
3d9a3b589af661f980a7c03f208915b54521639f':
docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147
Ricardo Cervera [Fri, 11 Apr 2014 16:19:06 +0000 (16:19 +0000)]
am
7186228a: am
d1f51fda: am
a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs
* commit '
7186228ae8505c3222be81680811d00de9bbdb6d':
docs: Added a document on debugging in Android Studio
Ricardo Cervera [Fri, 11 Apr 2014 16:14:23 +0000 (16:14 +0000)]
am
7abc67f4: am
2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147" into klp-docs
* commit '
7abc67f43fff9d2dc84d1bddfb3e5b3a04fbc30a':
docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147
Ricardo Cervera [Fri, 11 Apr 2014 16:14:17 +0000 (16:14 +0000)]
am
d1f51fda: am
a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs
* commit '
d1f51fda68ee23aaa83db62b32ad2b65d7fb4320':
docs: Added a document on debugging in Android Studio
Ricardo Cervera [Fri, 11 Apr 2014 16:11:59 +0000 (16:11 +0000)]
am
2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147" into klp-docs
* commit '
2abf55ca9b8a796ffb246538d319798dabedbec6':
docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147
Ricardo Cervera [Fri, 11 Apr 2014 16:11:56 +0000 (16:11 +0000)]
am
a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs
* commit '
a765e78241970f212991056b09027ef4df818d95':
docs: Added a document on debugging in Android Studio
Ricardo Cervera [Fri, 11 Apr 2014 16:07:47 +0000 (16:07 +0000)]
Merge "docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147" into klp-docs
Ricardo Cervera [Fri, 11 Apr 2014 16:06:22 +0000 (16:06 +0000)]
Merge "docs: Added a document on debugging in Android Studio" into klp-docs
Narayan Kamath [Fri, 11 Apr 2014 11:35:19 +0000 (11:35 +0000)]
am
af42a91c: Fix another build breakage.
* commit '
af42a91c118941d463b474574bf34bf05822350d':
Fix another build breakage.
Narayan Kamath [Fri, 11 Apr 2014 11:28:10 +0000 (12:28 +0100)]
Fix another build breakage.
Caused by
037c33eae74bee2774897d969d48947f9abe254f, which
was submitted without a checkbuild.
Change-Id: I0d48f6b941cc98a30904cdfbd7bcb56ed509734e
Narayan Kamath [Fri, 11 Apr 2014 10:54:20 +0000 (10:54 +0000)]
Narayan Kamath [Fri, 11 Apr 2014 10:42:33 +0000 (11:42 +0100)]
Fix build.
isScreenOn was changed to isInteractive.
Change-Id: I381d0b0ca745b61e64ac6309c2a6307696f52be0
Narayan Kamath [Fri, 11 Apr 2014 09:57:27 +0000 (09:57 +0000)]
am
de442781: am
909a6a0e: Merge "Dual zygote cleanup."
* commit '
de442781cd4f7404e8aaa3f7ca5d1d3fc28cccc6':
Dual zygote cleanup.
Jinsuk Kim [Fri, 11 Apr 2014 09:40:46 +0000 (09:40 +0000)]
am
b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
* commit '
b11f250e09195d1ab250c93bfed0b31ed3a40f3d':
Delegate HdmiCecService method impl to HdmiCecDevice subclass
Jinsuk Kim [Fri, 11 Apr 2014 09:38:22 +0000 (09:38 +0000)]
Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
Jinsuk Kim [Mon, 7 Apr 2014 04:39:17 +0000 (13:39 +0900)]
Delegate HdmiCecService method impl to HdmiCecDevice subclass
Most of the methods in the interface IHdmiCecService should be implemented
based on the device type. This CL makes a change such that the HdmiCecDevice
just has stub methods that should be overriden by subclasses.
Other changes:
- Fixed a bug of <Inactive Source> not sending its physical address
in its message body. Also the command should have been sent to TV
only rather than broadcast.
- Put back sendGiveDevicePowerStatus interface method. It allows the client
to keep track of the other device(like TV) power status more closely.
Devices goes through the status from standby -> transient to on -> on
but the CEC spec doesn't require that they broacast it actively.
The restored method can be used to let the playback device to get
up-to-date power status of TV/display when it is booting up.
This method should work the same across all the device types. So it was
implemented in the service, not delegated to HdmiCecDevice.
- Send <Report Physical Address> when a new logical device is registered,
which is required by CEC spec: "it should report the association between
its logical and physical address by broadcasting <Report Physical
Address>
Change-Id: Iac1d2cf5783d947f2dcd6965a54670fbdb8e6a63
Narayan Kamath [Fri, 11 Apr 2014 08:45:47 +0000 (08:45 +0000)]
am
909a6a0e: Merge "Dual zygote cleanup."
* commit '
909a6a0e2b5815332618b2cf731d27824a76d042':
Dual zygote cleanup.
Narayan Kamath [Fri, 11 Apr 2014 08:24:52 +0000 (08:24 +0000)]
Merge "Dual zygote cleanup."
Jeff Brown [Fri, 11 Apr 2014 03:49:37 +0000 (03:49 +0000)]
am
f24687e2: Merge "Plumb display power state through display manager." into klp-modular-dev
* commit '
f24687e2731811fd0e3803b691fd47a659f89329':
Plumb display power state through display manager.
Jeff Brown [Fri, 11 Apr 2014 03:47:08 +0000 (03:47 +0000)]
Merge "Plumb display power state through display manager." into klp-modular-dev
Jeff Brown [Wed, 9 Apr 2014 07:31:55 +0000 (00:31 -0700)]
Plumb display power state through display manager.
Declare a new method, Display.getState() to retrieve the actual
power state of a display.
Improved documentation for Intent.ACTION_SCREEN_ON and
Intent.ACTION_SCREEN_OFF to clarify what they really mean in
terms of the interactive state of the device.
Deprecated PowerManager.isScreenOn() and replaced it with
PowerManager.isInteractive() with a more suggestive name and
better documentation.
Redirect display power state changes to go through the display
manager first and only then head over to the power manager for
legacy compatibility.
Eliminated the bright here and woke here policy flags since they
were unused. Simplified the input dispatch policy somewhat.
Ensure that screen wake locks are respected up until the point
when dozing really begins.
Fixed a regression in DreamService where onDreamingStarted
might be called before onWindowAttached.
Bug:
13133142
Bug:
13472578
Bug:
13929355
Bug:
13760290
Change-Id: Iabef96921dd554ce3768fb18619cefc3230b5fb0
Aravind Akella [Mon, 7 Apr 2014 22:55:21 +0000 (22:55 +0000)]
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
This reverts commit
819239e5bec90ee3c861ac45fffac4a832a183a1.
Change-Id: I4bbb222e5c9dc65aed03aa28fd9e0f00fe335819
Ricardo Cervera [Fri, 28 Mar 2014 00:14:35 +0000 (17:14 -0700)]
docs: Added a document on debugging in Android Studio
Change-Id: I073e1db6d7976db0f658aac4aa377877ed931aa2
Baligh Uddin [Thu, 10 Apr 2014 15:55:25 +0000 (15:55 +0000)]
am
da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
da6b9599c77230c689d63e32ca80b62f60f18c27':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:51:37 +0000 (15:51 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Narayan Kamath [Thu, 10 Apr 2014 11:25:56 +0000 (11:25 +0000)]
am
940e76fd: am
b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"
* commit '
940e76fd378cebcd0d83099a5c31bc1e2bbeb2ba':
Removed android.debug.JNITest from preloaded-classes