OSDN Git Service
Ying Wang [Thu, 22 Jan 2015 20:36:05 +0000 (20:36 +0000)]
Merge "Check in "current" system API files." into lmp-mr1-dev
Ricardo Cervera [Thu, 22 Jan 2015 18:27:57 +0000 (18:27 +0000)]
am
02d093ca: am
bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
automerge:
65ab86c
* commit '
65ab86cf1ad414612ac57e14f581e0ffb1819e14':
docs: Fixes to the watch faces design guidelines
Ricardo Cervera [Thu, 22 Jan 2015 18:02:30 +0000 (18:02 +0000)]
am
02d093ca: am
bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
* commit '
02d093ca675535f1a7f702a9fffd277123cea8ca':
docs: Fixes to the watch faces design guidelines
Ricardo Cervera [Thu, 22 Jan 2015 17:56:54 +0000 (17:56 +0000)]
am
bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
* commit '
bdfcd56e7f01b7bb1f50c932792b9528c67892e5':
docs: Fixes to the watch faces design guidelines
Ricardo Cervera [Thu, 22 Jan 2015 17:50:47 +0000 (17:50 +0000)]
Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
Jason Monk [Thu, 22 Jan 2015 17:49:04 +0000 (17:49 +0000)]
Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev
Ricardo Cervera [Wed, 14 Jan 2015 16:29:38 +0000 (08:29 -0800)]
docs: Fixes to the watch faces design guidelines
Bug:
19001253
Change-Id: I356b887de71710afa27acc7544d0efdc3a857e91
Luan Nguyen [Thu, 22 Jan 2015 17:44:45 +0000 (17:44 +0000)]
am
edb9ba54: am
1dd76ea2: docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
automerge:
6117147
* commit '
61171477918ea55c70c706f062019f5cd2194043':
docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
Luan Nguyen [Thu, 22 Jan 2015 17:35:31 +0000 (17:35 +0000)]
am
edb9ba54: am
1dd76ea2: docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
* commit '
edb9ba54f7be81faacda4ee36824c6f8cd314fb3':
docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
Luan Nguyen [Thu, 22 Jan 2015 17:29:30 +0000 (17:29 +0000)]
am
1dd76ea2: docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
* commit '
1dd76ea2760f84496a5b82435fc35d7c28a6dd6d':
docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
Luan Nguyen [Wed, 21 Jan 2015 23:16:36 +0000 (15:16 -0800)]
docs: Fix companion configuration (
18864041)
Fix declaration of var and incorrect method call (
18617393)
bug:
18864041
bug:
18617393
Change-Id: Ic31e44acfe7338f56acdbbd97ba8cc1e87042b53
Jason Monk [Thu, 22 Jan 2015 15:39:37 +0000 (10:39 -0500)]
QS: Fix second line in dual tiles
QSDualTileLabel is no longer a FrameLayout (now a LinearLayout),
so it does not need the top padding based on the caret size
anymore.
Bug:
18725348
Change-Id: Ibd3aaa20e7cdb35ba585cc5c8981c64efb5c66fe
Jason Monk [Thu, 22 Jan 2015 14:11:52 +0000 (14:11 +0000)]
Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev
Nicolas Prevot [Thu, 22 Jan 2015 10:22:05 +0000 (10:22 +0000)]
Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev
Erik Kline [Thu, 22 Jan 2015 07:07:35 +0000 (07:07 +0000)]
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev
Jim Miller [Thu, 22 Jan 2015 02:37:38 +0000 (02:37 +0000)]
Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev
Jinsuk Kim [Thu, 22 Jan 2015 02:19:36 +0000 (02:19 +0000)]
Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev
Wonsik Kim [Thu, 22 Jan 2015 01:52:06 +0000 (01:52 +0000)]
Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev
Miao Wang [Thu, 22 Jan 2015 01:16:29 +0000 (01:16 +0000)]
Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev
Craig Mautner [Thu, 22 Jan 2015 00:25:17 +0000 (00:25 +0000)]
Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev
Robert Greenwalt [Wed, 21 Jan 2015 23:50:26 +0000 (23:50 +0000)]
Merge "Fix legacy request removal." into lmp-mr1-dev
Robert Greenwalt [Wed, 21 Jan 2015 23:49:11 +0000 (23:49 +0000)]
Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
Andrew Solovay [Wed, 21 Jan 2015 23:33:10 +0000 (23:33 +0000)]
am
78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge:
e628954
automerge:
d4cf09d
* commit '
d4cf09d3a0f90d61386eb1713ef2ed4ade00c061':
docs: WebView security notes for apps on pre-K devices
Luan Nguyen [Wed, 21 Jan 2015 23:31:44 +0000 (23:31 +0000)]
am
f082f898: Merge "docs: Fix conditional in ambient mode check method (
18832168). Fix issue with non existent variable (
18832287). Fix issue with outdated instructions (
18832293). Fix issue with misleading time tick (
18832171)." into lmp-docs automerge:
8884eda
automerge:
de9bd40
* commit '
de9bd40e21696ceeffc67ec24e6e43975461bc60':
docs: Fix conditional in ambient mode check method (
18832168). Fix issue with non existent variable (
18832287). Fix issue with outdated instructions (
18832293). Fix issue with misleading time tick (
18832171).
Andrew Solovay [Wed, 21 Jan 2015 23:22:45 +0000 (23:22 +0000)]
am
78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs
automerge:
e628954
* commit '
e628954ea49da6a798879815d221f4d2d871e79a':
docs: WebView security notes for apps on pre-K devices
Luan Nguyen [Wed, 21 Jan 2015 23:21:24 +0000 (23:21 +0000)]
am
f082f898: Merge "docs: Fix conditional in ambient mode check method (
18832168). Fix issue with non existent variable (
18832287). Fix issue with outdated instructions (
18832293). Fix issue with misleading time tick (
18832171)." into lmp-docs
automerge:
8884eda
* commit '
8884edaaeb0375338f5cf6474c91c3f55f44a172':
docs: Fix conditional in ambient mode check method (
18832168). Fix issue with non existent variable (
18832287). Fix issue with outdated instructions (
18832293). Fix issue with misleading time tick (
18832171).
Andrew Solovay [Wed, 21 Jan 2015 23:10:59 +0000 (23:10 +0000)]
am
78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs
* commit '
78f4342fac982a130a62dac2a459cef2a4c29f5a':
docs: WebView security notes for apps on pre-K devices
Luan Nguyen [Wed, 21 Jan 2015 23:10:55 +0000 (23:10 +0000)]
am
f082f898: Merge "docs: Fix conditional in ambient mode check method (
18832168). Fix issue with non existent variable (
18832287). Fix issue with outdated instructions (
18832293). Fix issue with misleading time tick (
18832171)." into lmp-docs
* commit '
f082f8980e742e9a60aeb91271caff38e10cf0a8':
docs: Fix conditional in ambient mode check method (
18832168). Fix issue with non existent variable (
18832287). Fix issue with outdated instructions (
18832293). Fix issue with misleading time tick (
18832171).
Jinsuk Kim [Fri, 16 Jan 2015 23:46:18 +0000 (08:46 +0900)]
CEC: Let playback device switch TV input after bootup
Saves users from having to switch TV input manually to a playback device
after it boots up.
Bug:
19046176
Change-Id: I0a4fae1036138ce2e19cbac9fdd9dda41bdcf89f
louis_chang [Wed, 21 Jan 2015 11:01:52 +0000 (19:01 +0800)]
Resume home activity can skip resume and cause ANR. DO NOT MERGE
Symptom:
In some scenario, there might have two home tasks
in the home stack. If the top home task was finishing
and expected to return to home stack, no activity
will resume.
Root Cause:
Unable to perform resumeHomeStackTask() because the
resumeTopActivityLocked() has been prevented to invoke
recursively.
Solution:
Just resume the next activity if already in home stack
Change-Id: I24ecbcac6cee4ddbd90cdd27c4f4915cffb9b354
Miao Wang [Thu, 15 Jan 2015 19:09:23 +0000 (11:09 -0800)]
[Renderscript] Add check for Allocation.copyTo(Array) and
Fix the input allocation type check for Histogram Intrinsic.
Bug:
19035242
Change-Id: I0ef2672bf816854db90fc92dc9ef51d1d231c246
Jim Miller [Thu, 15 Jan 2015 02:17:19 +0000 (18:17 -0800)]
Clarify getTrustAgentConfiguration() documentation.
Fixes bug
18983802
Change-Id: I2f6e208cdd4fac95d1d0228bec3de8199baafa57
Jason Monk [Wed, 14 Jan 2015 15:13:22 +0000 (10:13 -0500)]
Show connect dialog when selecting secure QS wifi
Use startSettingsActivity (QSTileHost) to make sure we use the right flags
and get the keyguard out of the way so the user always sees the
connect dialog for secure networks when they are sent to settings.
Bug:
18987307
Change-Id: I9027393ab8743e6dfe702221cb3bc1bb4e213708
Alan Viverette [Wed, 21 Jan 2015 20:30:49 +0000 (12:30 -0800)]
Avoid ripple buffer creation for empty bounds
Bug:
19068439
Change-Id: I031d4303bbf101a25612dce6f02d81ce4cf58e2b
Andrew Solovay [Wed, 21 Jan 2015 19:20:57 +0000 (19:20 +0000)]
Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs
Dianne Hackborn [Wed, 21 Jan 2015 18:41:37 +0000 (18:41 +0000)]
Merge "Work on issue #
18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev
Svetoslav [Fri, 16 Jan 2015 23:42:58 +0000 (15:42 -0800)]
AlertActivity now behaves as a dialog for accessibility purposes.
AlertActivity is intended to look like a dialog but for accessibility
purposes it was populated as an activity. As a result the content of
the "dialog" was not properly announced to the user.
bug:
18865632
Change-Id: I27166fc74678981f4f3ad71d6d25727b5110340c
Dianne Hackborn [Wed, 21 Jan 2015 17:55:13 +0000 (09:55 -0800)]
Work on issue #
18201239: ANRs in com.google.process.gapps:
Reason: Executing service com.google.android.syncadapters.contacts
/.SyncHighResPhotoIntentService
Make the code more robust when destroying services, so that if
the nesting count gets out of sync we don't just hang.
Change-Id: If117d5ef242e7c148fd9576bd89a1a092583d6ad
Nicolas Prevot [Wed, 21 Jan 2015 17:50:23 +0000 (17:50 +0000)]
Never set "Work" or "Personal apps" as prefered activities.
In ResolverActivity: when the user chooses work or personal:
Do not set them as prefered activities.
BUG:
19091836
Change-Id: Ibe0081eb16e58cc25decb3f25b7fd50b5403d5fc
Luan Nguyen [Wed, 21 Jan 2015 16:19:18 +0000 (16:19 +0000)]
Merge "docs: Fix conditional in ambient mode check method (
18832168). Fix issue with non existent variable (
18832287). Fix issue with outdated instructions (
18832293). Fix issue with misleading time tick (
18832171)." into lmp-docs
Kenny Guy [Wed, 21 Jan 2015 16:13:21 +0000 (16:13 +0000)]
Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev
Luan Nguyen [Tue, 20 Jan 2015 16:41:51 +0000 (08:41 -0800)]
docs: Fix conditional in ambient mode check method (
18832168).
Fix issue with non existent variable (
18832287).
Fix issue with outdated instructions (
18832293).
Fix issue with misleading time tick (
18832171).
bug:
18832168
bug:
18832171
bug:
18832287
bug:
18832293
Change-Id: I4f071846589ba7edda500342ccd5fac6ecca3161
Geoff Mendal [Wed, 21 Jan 2015 14:15:11 +0000 (08:15 -0600)]
Import translations. DO NOT MERGE
Change-Id: I3d03c8e758bc8ecfe8e8b789fcfeab386e7eec9a
Auto-generated-cl: translation import
Erik Kline [Mon, 19 Jan 2015 07:19:09 +0000 (16:19 +0900)]
Log interface name and uid when filtering a blocked network.
Bug:
18707263
Change-Id: Ide9a1670a97eae787b785933de0c80750c2b5601
Jinsuk Kim [Wed, 21 Jan 2015 02:10:53 +0000 (02:10 +0000)]
Merge "CEC: Switch active input after routing control" into lmp-mr1-dev
Jinsuk Kim [Wed, 21 Jan 2015 00:32:30 +0000 (09:32 +0900)]
CEC: Switch active input after routing control
Makes sure the previous HDMI input gets switched to upon receiving
<Inactive Source> from the current active source device.
Bug:
18986597
Change-Id: I7120e81d75b5fd4cafd4b483e9b232b96e50f597
Ying Wang [Fri, 9 Jan 2015 19:51:26 +0000 (11:51 -0800)]
Check in "current" system API files.
The API files were generated by running "make showcommands update-system-api".
Bug:
18960664
Change-Id: Ibb4756d98be3cbf67f6103f5d5d8ff060b3c34c9
Dianne Hackborn [Wed, 21 Jan 2015 00:23:52 +0000 (00:23 +0000)]
Merge "Fix issue #
19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev
Andrew Solovay [Tue, 20 Jan 2015 23:47:31 +0000 (15:47 -0800)]
docs: WebView security notes for apps on pre-K devices
Added paragraph describing security precautions for apps that use
WebView on devices running versions older than Android 4.4. See first
comment for doc stage location.
bug:
19075466
Change-Id: I69937d8dfc37ec1ba693f969500b9dc7404c4635
Craig Mautner [Tue, 20 Jan 2015 23:07:55 +0000 (23:07 +0000)]
Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev
Craig Mautner [Tue, 20 Jan 2015 22:57:41 +0000 (22:57 +0000)]
Merge "More debugging for bug
17721767" into lmp-mr1-dev
Dianne Hackborn [Tue, 20 Jan 2015 21:43:32 +0000 (13:43 -0800)]
Fix issue #
19020826: Including timing issues in ANR reason breaks clustering
Also improve service ANR debugging.
Change-Id: I2118ef2811ca3ba676c110639f58d5c21abfb8eb
Christopher Tate [Tue, 20 Jan 2015 22:54:57 +0000 (22:54 +0000)]
Merge "Don't launch broadcast receiver processes during boot" into lmp-mr1-dev
Christopher Tate [Tue, 20 Jan 2015 22:54:53 +0000 (22:54 +0000)]
Merge "Don't try to launch broadcast receivers during boot" into lmp-mr1-dev
Sanket Padawe [Tue, 20 Jan 2015 22:50:02 +0000 (22:50 +0000)]
Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev
Sanket Padawe [Tue, 20 Jan 2015 22:40:14 +0000 (14:40 -0800)]
Fixed a crash in TelephonyManager while calling getDeviceID()
Bug:
19056848
Change-Id: Ie241b25be212910a177c3ee5b620d646cfdd482f
Jinsuk Kim [Tue, 20 Jan 2015 22:39:52 +0000 (22:39 +0000)]
Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev
Craig Mautner [Tue, 20 Jan 2015 22:35:25 +0000 (22:35 +0000)]
Revert "Remove debugging and skip InputMethod windows"
This reverts commit
668cae1d4724cf794571f1ee2a3e896984b97db7.
Too soon. I need this for debug.
Change-Id: Ibeaec0139f511cf389049bdb7dae368a7bd8186b
Craig Mautner [Tue, 20 Jan 2015 22:34:00 +0000 (22:34 +0000)]
Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev
Jinsuk Kim [Tue, 20 Jan 2015 22:00:00 +0000 (07:00 +0900)]
Mark TimeUnit as @SystemApi
Bug:
18960664
Change-Id: If2c1259b312138bad9416b10f14a8af0f1a222f4
Christopher Tate [Tue, 20 Jan 2015 22:29:22 +0000 (14:29 -0800)]
Don't try to launch broadcast receivers during boot
It turns out that sysUI visibility / interactivity is racing with
boot, and it's possible in some circumstances for the user to start
the secure camera swipe gesture before formal boot-completed. Make
sure we only send the camera-related broadcast to registered
receivers in that case, otherwise we'll implicitly be asking to
launch other apps before boot, which is forbidden.
Bug
19060618
Change-Id: I7fcf13b5af7b2edfbb4aac06ef04a0fde2c6a0f7
Craig Mautner [Tue, 20 Jan 2015 22:26:10 +0000 (22:26 +0000)]
Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev
Christopher Tate [Tue, 20 Jan 2015 22:21:21 +0000 (14:21 -0800)]
Don't launch broadcast receiver processes during boot
Broadcasts that might be sent before the boot process has completed must
be restricted to registered receivers, at least while still in the
middle of booting.
Bug
19060618
Change-Id: Ib4e0990cf252f34344f7a0bd19a0e72919013e0f
Craig Mautner [Tue, 20 Jan 2015 19:56:27 +0000 (11:56 -0800)]
Do not defer removal for empty tasks or activities
It is possible for empty activities to be leaked if their last
window is removed before animations finish. This change keeps tasks
and activities from having removal deferred if they have no windows.
Fixes bug
19047432
Change-Id: If6562f46bbfcac9ba987e2c834a1d55a9a8f3766
Adam Lesinski [Tue, 20 Jan 2015 21:41:45 +0000 (21:41 +0000)]
Merge "Process base APK" into lmp-mr1-dev
Christopher Tate [Tue, 20 Jan 2015 21:23:59 +0000 (21:23 +0000)]
Merge "Don't write widget metadata to backup unless it's new/changed" into lmp-mr1-dev
Wale Ogunwale [Thu, 15 Jan 2015 23:36:48 +0000 (15:36 -0800)]
Update restored task uid to match the package uid on current device.
The uid on the task we are restoring from another device are
meaningless on the current device. Change updates the uid of any
task we restore to match the package uid on the current device.
Bug:
19014377
Change-Id: I285fbe9f509cae3d2e9a212a59e88f34b4db20e5
Kenny Guy [Mon, 19 Jan 2015 16:26:07 +0000 (16:26 +0000)]
Only hide cross profile disclosure when showing resolver.
Hiding the cross profile discoloure for all system apps
also meant it wasn't shown for CALL_PRIVILEGED intents.
Bug:
18702461
Change-Id: I8129bc4b07573b547aefe2dbcc6938a60305c216
Craig Mautner [Tue, 20 Jan 2015 18:49:22 +0000 (10:49 -0800)]
More debugging for bug
17721767
Narrow down why GEL is being resumed instead of the top stack.
Change-Id: I79c0be4adf0ccee30e1a5aa4308ee91148f239fa
Ricardo Cervera [Tue, 20 Jan 2015 18:32:22 +0000 (18:32 +0000)]
am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256 automerge:
e8f6bd4 automerge:
eada048 automerge:
458f432
automerge:
47e274c
* commit '
47e274c56a0662e3e2aef24f2a458cc078e70fd8':
Ricardo Cervera [Tue, 20 Jan 2015 18:10:49 +0000 (18:10 +0000)]
am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256 automerge:
e8f6bd4 automerge:
eada048
automerge:
458f432
* commit '
458f4326bdff638cefe175b179a487872cf678c1':
Ricardo Cervera [Tue, 20 Jan 2015 18:03:50 +0000 (18:03 +0000)]
am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256 automerge:
e8f6bd4
automerge:
eada048
* commit '
eada048addc14a95ced54b17c6a75f5f899e2c2a':
Ricardo Cervera [Tue, 20 Jan 2015 17:57:45 +0000 (17:57 +0000)]
am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256
automerge:
e8f6bd4
* commit '
e8f6bd484627e16fa2fd9509b0f06056ee44be94':
docs: Added info on noHistory and onActivityResult(). Bug:
13807256
Wonsik Kim [Mon, 19 Jan 2015 07:07:48 +0000 (16:07 +0900)]
TIF: TvInputHardwareManager puts multiple sink ports into audio patch
Bug:
18823504
Change-Id: Id1dfe6c87bb26a8cb3ffafae8b256fa9e87d9d8c
Geoff Mendal [Mon, 19 Jan 2015 14:49:11 +0000 (06:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: If4c684beabdf14e6dad7c9584ac9b9cb0fb048d0
Auto-generated-cl: translation import
Jinsuk Kim [Sun, 18 Jan 2015 22:30:12 +0000 (07:30 +0900)]
CEC: Process new options for CEC/MHL HAL
1) Inform MHL HAL of OPTION_MHL_SERVICE_CONTROL at system
ready/standby event.
2) Call OPTION_CEC_SET_LANGUAGE with current system language info
for HAL to be able to respond to <Get Menu Language> while in standby
mode.
Bug:
19054079
Change-Id: I92c9f392a94f70e11157d20a33163ef2d8bc832f
Jinsuk Kim [Mon, 19 Jan 2015 02:20:17 +0000 (02:20 +0000)]
Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev
Jinsuk Kim [Fri, 16 Jan 2015 22:38:24 +0000 (07:38 +0900)]
CEC: Make TV try to allocate logical address 0 first
HDMI Spec says TV shall try to allocate TV() logical address, unlike
other kinds of devices that are recommended to use the previously
allocated one.
Also included are small changes:
- reply with 'can not provide source' if TV has no source to provide
- return the present device info if we have one at the given path
Bug:
19045081
Change-Id: Icf17cb581f0ef2274e252ec5665f80bb1c08b494
Sanket Padawe [Sat, 17 Jan 2015 22:15:54 +0000 (22:15 +0000)]
Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev
Scott Rowe [Sat, 17 Jan 2015 05:20:28 +0000 (05:20 +0000)]
am
ae15e779: am
224624e8: am
c987ca05: Merge "docs: removing code captions" into lmp-docs
* commit '
ae15e779c0a0a9005292efb0f39729454429fa7f':
docs: removing code captions
Scott Rowe [Sat, 17 Jan 2015 05:20:23 +0000 (05:20 +0000)]
am
49caa638: am
78001f93: am
ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
* commit '
49caa6386c1423ad9ced3e3ad983dd233a76e2e4':
docs: Add screenshot
Scott Rowe [Sat, 17 Jan 2015 03:06:38 +0000 (03:06 +0000)]
am
224624e8: am
c987ca05: Merge "docs: removing code captions" into lmp-docs
* commit '
224624e8e68bd1debd0f76d1b614ae3bdc637cb2':
docs: removing code captions
Scott Rowe [Sat, 17 Jan 2015 03:06:35 +0000 (03:06 +0000)]
am
78001f93: am
ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
* commit '
78001f9338b72876e95b7d25053b706804a21070':
docs: Add screenshot
Scott Rowe [Sat, 17 Jan 2015 02:28:51 +0000 (02:28 +0000)]
am
c987ca05: Merge "docs: removing code captions" into lmp-docs
* commit '
c987ca05010a8cc06572d5b04c93fb6404f8bf45':
docs: removing code captions
Scott Rowe [Sat, 17 Jan 2015 02:28:47 +0000 (02:28 +0000)]
am
ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
* commit '
ab18d6c82eb92732ef7ab54adffcd27faffd0c57':
docs: Add screenshot
Scott Rowe [Sat, 17 Jan 2015 01:31:52 +0000 (01:31 +0000)]
Merge "docs: removing code captions" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 01:31:13 +0000 (01:31 +0000)]
Merge "docs: Add screenshot" into lmp-docs
David Friedman [Sat, 17 Jan 2015 00:43:30 +0000 (00:43 +0000)]
am
ae71c8ea: am
e255cb0f: am
fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
* commit '
ae71c8ea52af7e4205ae838e73837d145f416e1a':
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
David Friedman [Sat, 17 Jan 2015 00:36:27 +0000 (00:36 +0000)]
am
e255cb0f: am
fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
* commit '
e255cb0f9e0ecd5f0aa2c963f1a6d4c7029c85af':
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
David Friedman [Sat, 17 Jan 2015 00:30:18 +0000 (00:30 +0000)]
am
fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
* commit '
fa66fdd57a494bed0a92d9fb0aadf332395f371f':
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
David Friedman [Sat, 17 Jan 2015 00:23:29 +0000 (00:23 +0000)]
Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
Robert Greenwalt [Thu, 8 Jan 2015 22:43:31 +0000 (14:43 -0800)]
Fix legacy request removal.
Don't say we're disconnected from a legacy type until there are no outstanding requests for it.
bug:
18946574
Change-Id: I8e45c4a7558f7ced0840b71c50081989ba13c1c7
David Friedman [Wed, 19 Nov 2014 21:03:45 +0000 (13:03 -0800)]
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f
Craig Mautner [Wed, 14 Jan 2015 21:33:20 +0000 (13:33 -0800)]
Remove debugging and skip InputMethod windows
1. Remove debug for bug
17721767.
2. When adding activity windows based on base layer skip over
InputMethod windows.
Change-Id: I3600e9acd997002ce87d34df2af577cc7b648480
RoboErik [Fri, 16 Jan 2015 22:56:52 +0000 (22:56 +0000)]
Merge "Notify the system of all remote volume changes" into lmp-mr1-dev
Quddus Chong [Fri, 16 Jan 2015 22:35:03 +0000 (22:35 +0000)]
am
a6491229: am
930ac01f: am
de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug:
17959906" into lmp-docs
* commit '
a649122977a6f1c267329b9b67a692cabd839e98':
docs: Fixed typos in Game Controller training code snippets. bug:
17959906
Joe Fernandez [Fri, 16 Jan 2015 22:29:48 +0000 (22:29 +0000)]
am
cd500663: am
90d2aca7: am
217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
* commit '
cd50066386887148f99dce9b449bed588a354bb3':
docs: adding studio-sample-in-editor.png file
Ricardo Cervera [Fri, 16 Jan 2015 22:29:43 +0000 (22:29 +0000)]
am
9273b33f: am
73f36d47: am
e229751d: docs: Add browseable Wearable Support Lib Javadoc
* commit '
9273b33f6ecfa20ff524ae6fcb88f2586c79b6da':
docs: Add browseable Wearable Support Lib Javadoc
Quddus Chong [Fri, 16 Jan 2015 22:28:24 +0000 (22:28 +0000)]
am
930ac01f: am
de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug:
17959906" into lmp-docs
* commit '
930ac01fd728067a79335e2983b870528c13a872':
docs: Fixed typos in Game Controller training code snippets. bug:
17959906
Joe Fernandez [Fri, 16 Jan 2015 22:23:22 +0000 (22:23 +0000)]
am
90d2aca7: am
217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
* commit '
90d2aca7f05b2e2acf8a7bc37d8007074fdbdea5':
docs: adding studio-sample-in-editor.png file