OSDN Git Service
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 [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
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: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: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
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
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: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: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: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 [Thu, 10 Apr 2014 17:42:19 +0000 (10:42 -0700)]
Added getLeanbackLaunchIntentForPackage()
Change-Id: I23be3bfa59be812a915adc37e08fdf59be8ad90f
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: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:42:33 +0000 (11:42 +0100)]
Fix build.
isScreenOn was changed to isInteractive.
Change-Id: I381d0b0ca745b61e64ac6309c2a6307696f52be0
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
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:51:37 +0000 (15:51 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Deepanshu Gupta [Tue, 25 Feb 2014 23:27:29 +0000 (15:27 -0800)]
Add DatePickerDialog to layoutlib [DO NOT MERGE]
Includes android.app.DatePickerDialog in the layoutlib.jar
Bug: http://b.android.com/28318
Change-Id: I583dde4a8b88204bf98bfca8d91470e1aa4719ce
(cherry picked from commit
c2016d4073c61e87439d4fa14837b397a3c1630a)
Zhihai Xu [Wed, 9 Apr 2014 18:19:04 +0000 (18:19 +0000)]
Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev
Jesse Gunsch [Wed, 9 Apr 2014 18:09:02 +0000 (18:09 +0000)]
Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev
Andre Eisenbach [Tue, 18 Mar 2014 21:26:51 +0000 (14:26 -0700)]
LE: Return false if an attribute read/write is in progress
bug:
12109128
Change-Id: I0155fcddc850aba47a1bf3e174d4ee582d50b187
Baligh Uddin [Wed, 9 Apr 2014 16:53:03 +0000 (09:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I974afb393ebd8cf341012d3c08cad60b578cda30
Auto-generated-cl: translation import
Jeff Brown [Wed, 9 Apr 2014 04:36:51 +0000 (04:36 +0000)]
Merge "Move certain internal activity manager methods to new class." into klp-modular-dev
Jeff Brown [Wed, 9 Apr 2014 04:33:27 +0000 (04:33 +0000)]
Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
Jeff Brown [Tue, 8 Apr 2014 02:45:27 +0000 (19:45 -0700)]
Move certain internal activity manager methods to new class.
This is a little bit of refactoring in preparation for changing how
the power manager notifies system components about changes in power
state.
Deleted the startRunning method since it is no longer useful.
Bug:
13133142
Change-Id: I7f845c61ecc7ee890154ed0cbd90795de609b7ea
Jeff Brown [Wed, 9 Apr 2014 00:26:30 +0000 (17:26 -0700)]
Move display power controller to display manager service. (DO NOT MERGE)
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes. Some bits will be cleaned up in
a subsequent patch.
Bug:
13133142
Change-Id: Ib811835e8757449c7899ac61807029baaf998161
Dave Platt [Thu, 13 Mar 2014 23:35:15 +0000 (23:35 +0000)]
Merge "NsdService does not clean up after exiting clients"
Adam Hampson [Tue, 8 Apr 2014 15:51:22 +0000 (15:51 +0000)]
Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into klp-modular-dev
Baligh Uddin [Tue, 8 Apr 2014 02:16:35 +0000 (02:16 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Narayan Kamath [Fri, 14 Feb 2014 17:14:09 +0000 (17:14 +0000)]
DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.
(cherry picked from commit
b3802a8e2360aaa0a88faa625e15c31b56eaf125)
Bug:
13763685
Bug:
13763900
Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
Adam Hampson [Mon, 7 Apr 2014 21:27:53 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
Robert Greenwalt [Mon, 7 Apr 2014 20:46:58 +0000 (20:46 +0000)]
am
e1d4847c: am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
e1d4847c120f4ab72b3acfed17c0015bdb2befaf':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:41:00 +0000 (20:41 +0000)]
am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
331fa429cad1f464f0375a3466ba528b03c6e90d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:37:38 +0000 (20:37 +0000)]
am
c855a28a: am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:34:49 +0000 (20:34 +0000)]
am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
a3d3e8c4f92a637adc79ea21cc3c3ae49fe06312':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:31:45 +0000 (20:31 +0000)]
am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
5f3c0630e488bbcee687933b6350370a42354dc4':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:27:50 +0000 (20:27 +0000)]
am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
463eeb70938403bdca2519d9b71911aab93b9277':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:26:35 +0000 (20:26 +0000)]
am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
522bd7fb3468bc07133c7ff1a02033dcced740b9':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:21:52 +0000 (20:21 +0000)]
am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2676e36ff6fc3f779cb6f1b0db13e26d734dcbab':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:18:41 +0000 (20:18 +0000)]
am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
24444abff4ad45b731d4f6cd92afed79568773d8':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:16:15 +0000 (20:16 +0000)]
am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
3e604b1198fcab0e3bf2fd29043e4172193db2b5':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:12:56 +0000 (20:12 +0000)]
am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
53691e39dca8be5dbe19bfef05b1c3e294d6c0bd':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:09:33 +0000 (20:09 +0000)]
am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2c90609c0bddb6fbe255e5632a1e6639e760290f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:07:10 +0000 (20:07 +0000)]
am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
128e937108035b77537f279dc0bc85a116906819':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:03:55 +0000 (20:03 +0000)]
am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
339cfdbde333984d02d189249f46e7b13317baed':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:00:33 +0000 (20:00 +0000)]
am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
106627e07cecfa8a9bcc43578fde78652fc59eba':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:57:32 +0000 (19:57 +0000)]
am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
72f9b3084cf8bf0ca01ba52a853faeeb74acdad4':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:54:13 +0000 (19:54 +0000)]
am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
e42ce676f54742f2d47c26adaa90407c2cb8cec8':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:51:34 +0000 (19:51 +0000)]
am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
4bc58bd255f3a0cd9bb3a8f7a916a3cccb96ce6b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:48:39 +0000 (19:48 +0000)]
am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
ebf23a8d9ef7eb2d14ef19bff5525eb16604da7c':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:47:49 +0000 (19:47 +0000)]
am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
c0d94e7ac6353757b7fa4d7f6fce75c5719c7e6e':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:49 +0000 (19:42 +0000)]
am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
f52d1a56af8cc769c1019fbb0d8b7a2254fcc01b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:32 +0000 (19:42 +0000)]
am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
74acf23a1eef75628c8fa9e2ff7ba08ed4258558':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:36:54 +0000 (19:36 +0000)]
am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:36:44 +0000 (19:36 +0000)]
am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
3c417fbf21133340cbbe3539d87c453f81ae3a9d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:30:10 +0000 (19:30 +0000)]
Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
Baligh Uddin [Mon, 7 Apr 2014 16:16:57 +0000 (09:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae9d84c74d8580328bab4e9bab8e7ca5dfc90693
Auto-generated-cl: translation import
quddusc [Sat, 5 Apr 2014 22:32:35 +0000 (22:32 +0000)]
am
b430ec75: am
7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
* commit '
b430ec756473330f47bda2d8f0c266b3398169c9':
docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101
quddusc [Sat, 5 Apr 2014 22:27:25 +0000 (22:27 +0000)]
am
7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
* commit '
7db3875cdca4c94cb667d2d0cc86718f15e3305c':
docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101
quddusc [Sat, 5 Apr 2014 22:23:35 +0000 (22:23 +0000)]
Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
Etienne Le Grand [Sat, 5 Apr 2014 04:47:14 +0000 (04:47 +0000)]
Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
This reverts commit
fd53d8352a4617941b0a0449390aa562a01ea1d3.
Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
Etienne Le Grand [Tue, 25 Mar 2014 04:29:28 +0000 (21:29 -0700)]
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
Change-Id: I16e5da68f860494e24cca64075be76fad02617bc
Narayan Kamath [Thu, 6 Feb 2014 11:50:31 +0000 (11:50 +0000)]
DO NOT MERGE Fix several bad function definitions.
We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).
bug:
12890271
(cherry picked from
047b938f7188c21c07669108c5c68b2358f6b158)
Change-Id: I6ce506131780d7cdeb05df9a7b8322f5494eeab2
Katie McCormick [Fri, 4 Apr 2014 21:31:28 +0000 (21:31 +0000)]
am
f7bffe77: am
fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs
* commit '
f7bffe7707f31da920a8ff08d013934562e9a43d':
Doc Update: notification bug fix.
Katie McCormick [Fri, 4 Apr 2014 21:17:29 +0000 (21:17 +0000)]
am
fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs
* commit '
fc8ea92df15689d51079212d7d012756ce9298d2':
Doc Update: notification bug fix.
Katie McCormick [Fri, 4 Apr 2014 21:12:16 +0000 (21:12 +0000)]
Merge "Doc Update: notification bug fix." into klp-docs
Katie McCormick [Fri, 4 Apr 2014 21:04:36 +0000 (14:04 -0700)]
Doc Update: notification bug fix.
Fixes:
b/
13429906
Change-Id: I5c5c12cb244351f71d043c4fb4495828b02ca362
John Spurlock [Fri, 4 Apr 2014 19:24:09 +0000 (19:24 +0000)]
Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
John Spurlock [Thu, 3 Apr 2014 20:37:27 +0000 (16:37 -0400)]
Introduce new UI_MODE_TYPE_WATCH and qualifier.
Default ui mode to watch if we have FEATURE_WATCH.
Bug:
13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
Ricardo Cervera [Fri, 4 Apr 2014 17:42:44 +0000 (17:42 +0000)]
am
5df82523: am
ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug:
13716053" into klp-docs
* commit '
5df825237afd016c48dd3577d839825e5161d3e7':
docs: Added permissions note for Context.getFilesDir. Bug:
13716053
Ricardo Cervera [Fri, 4 Apr 2014 17:38:59 +0000 (17:38 +0000)]
am
ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug:
13716053" into klp-docs
* commit '
ff3d89c08cd69c506ea07fb30a58f88e188b2dd9':
docs: Added permissions note for Context.getFilesDir. Bug:
13716053
Ricardo Cervera [Fri, 4 Apr 2014 17:32:57 +0000 (17:32 +0000)]
Merge "docs: Added permissions note for Context.getFilesDir. Bug:
13716053" into klp-docs
Ricardo Cervera [Fri, 4 Apr 2014 17:32:42 +0000 (17:32 +0000)]
am
a821af68: am
715139a6: Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
* commit '
a821af684e2a5f814fc8709518b5f0589c81661e':
docs: Fixed action bar example. Bug:
13806963
Ricardo Cervera [Fri, 4 Apr 2014 17:29:00 +0000 (17:29 +0000)]
am
715139a6: Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
* commit '
715139a620383c89e061a2b0650e184bf3382a10':
docs: Fixed action bar example. Bug:
13806963
Ricardo Cervera [Fri, 4 Apr 2014 17:26:05 +0000 (10:26 -0700)]
docs: Added permissions note for Context.getFilesDir. Bug:
13716053
Change-Id: I02e17c358630ab298bb99731723405cdeae701fc
Ricardo Cervera [Fri, 4 Apr 2014 17:23:08 +0000 (17:23 +0000)]
Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
Ricardo Cervera [Fri, 4 Apr 2014 17:01:35 +0000 (17:01 +0000)]
am
e2bdd6ae: am
6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug:
13671312" into klp-docs
* commit '
e2bdd6ae33640430fc4a0d58c263d5af94fdee77':
docs: Updated the link to buy a Nexus phone. Bug:
13671312
Ricardo Cervera [Fri, 4 Apr 2014 16:55:02 +0000 (16:55 +0000)]
am
6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug:
13671312" into klp-docs
* commit '
6ae21ea7fb37c76429a48a41987c9c0e2c067c31':
docs: Updated the link to buy a Nexus phone. Bug:
13671312
Ricardo Cervera [Fri, 4 Apr 2014 16:51:20 +0000 (16:51 +0000)]
Merge "docs: Updated the link to buy a Nexus phone. Bug:
13671312" into klp-docs
Ricardo Cervera [Fri, 4 Apr 2014 16:46:11 +0000 (09:46 -0700)]
docs: Fixed action bar example. Bug:
13806963
Change-Id: I27dd1b80cf13eb3d47f48992db535de5a62bcde9
Ricardo Cervera [Fri, 4 Apr 2014 16:30:02 +0000 (16:30 +0000)]
am
c23ab90c: am
07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
* commit '
c23ab90c80c76c0f5249190ff26dac1fa5992d3b':
docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
Ricardo Cervera [Fri, 4 Apr 2014 16:25:45 +0000 (16:25 +0000)]
am
07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
* commit '
07aac5e346c3fed31254e34d386c6236f1ac3f22':
docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
Baligh Uddin [Fri, 4 Apr 2014 14:30:55 +0000 (14:30 +0000)]
am
b2856041: (-s ours) am
81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
b285604185de1ade346eadb78971712607f54058':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:30:52 +0000 (14:30 +0000)]
am
15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
15fdce9d65b47e2b92bcac78776cc01486cff61a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:28:01 +0000 (14:28 +0000)]
am
81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
81e62eb1e576388866779e6f29d71614892dcf8a':
Import translations. DO NOT MERGE
OSDN Git Service
