OSDN Git Service
Adam Lesinski [Wed, 23 Jul 2014 01:24:28 +0000 (01:24 +0000)]
Merge "Add test UsageStats App" into lmp-dev
Adam Lesinski [Tue, 22 Jul 2014 22:55:50 +0000 (15:55 -0700)]
Add test UsageStats App
Also fixed UsageStatsService to do the right thing
when AppOps returns MODE_DEFAULT.
Change-Id: I0bdb28350fb2528daf2859cdcbbf9ca48d96dde9
John Spurlock [Wed, 23 Jul 2014 01:11:41 +0000 (01:11 +0000)]
Merge "Wire up CATEGORY_ALARM and CATEGORY_EVENT." into lmp-dev
John Spurlock [Wed, 23 Jul 2014 00:39:58 +0000 (20:39 -0400)]
Wire up CATEGORY_ALARM and CATEGORY_EVENT.
And remove the alarm package whitelist now that deskclock
uses a category.
Bug:
16406214
Change-Id: I6ca400376a9df7646889e394e53e4d491c56a46c
Craig Mautner [Tue, 22 Jul 2014 23:47:26 +0000 (16:47 -0700)]
Refactor window manager screenshot
For readability, and add rotation compensation.
Fixes bug
16142514.
Change-Id: I1156ec2e0f052f6dec56457d56efe95368f60d91
Andrew Lee [Tue, 22 Jul 2014 22:42:35 +0000 (22:42 +0000)]
Merge "Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs."" into lmp-dev
Andrew Lee [Tue, 22 Jul 2014 22:42:10 +0000 (22:42 +0000)]
Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs."
This reverts commit
080b1f58eb877e1ac375768c6f951cc61a3cdbae.
Change-Id: I0dc963b3f4efe1479a7a94b8d851b89d15480d17
Andrew Lee [Tue, 22 Jul 2014 19:09:38 +0000 (12:09 -0700)]
Don't throw RemoteException in public RemoteCallVideoClient APIs.
- Hide constructor.
- No longer implements IBinder.DeathRecipient.
- Catch RemoteExceptions instead of throwing RemoteExceptions.
Change-Id: Id666818b868c61f17b0701e4590d4e36f12c7b01
Christopher Tate [Tue, 22 Jul 2014 22:39:04 +0000 (22:39 +0000)]
Merge "Always check restore against the latest backend metadata" into lmp-dev
Winson Chung [Tue, 22 Jul 2014 19:27:13 +0000 (12:27 -0700)]
Intermediate refactoring to move towards in-app view transitions.
- Fixing bug where we weren't toggling to the right task when using affiliations
- Refactoring task rect calculation to allow full screen task view to be laid out for transitions
- Refactoring the view bounds animations into a separate class
- Refactoring the footer view (for lock-to-task) out of TaskView
- Refactoring some transform code out of TaskView
- Removing fullscreen overlay view
- Fixing case where extra invalidations and layouts were still happening in FixedSizeImageView
- Adding debug overlay to replace specific debug drawing code
Change-Id: Ibf98b6a0782a68cd84582203c807cece1ff3379f
Christopher Tate [Tue, 22 Jul 2014 19:54:52 +0000 (12:54 -0700)]
Always check restore against the latest backend metadata
Bug
16484934
Change-Id: I472a7db89a94b9804f6ea94c25da206dd111a497
Alex Klyubin [Mon, 21 Jul 2014 17:09:58 +0000 (10:09 -0700)]
Align PSKKeyManager with framework API style.
This CL adjusts android.net.PSKKeyManager as follows:
* Renamed to PskKeyManager to follow naming conventions.
* Changed from interface to abstract class with default
implementations for all methods.
Bug:
16403305
Bug:
15073623
Change-Id: Iefce26b394d4a753412315dad554b5342f3f0b44
Carlos Valdivia [Wed, 23 Jul 2014 00:33:51 +0000 (00:33 +0000)]
Merge "Allow authenticators to rename accounts." into lmp-dev
Chris Craik [Wed, 23 Jul 2014 00:25:21 +0000 (00:25 +0000)]
Merge "Make setter methods on Outline call setEmpty() based on params" into lmp-dev
Chris Craik [Mon, 21 Jul 2014 17:25:54 +0000 (10:25 -0700)]
Make setter methods on Outline call setEmpty() based on params
bug:
16142564
Additionally, better define behavior around null outline providers:
A view with an empty outline, and setClipToOutline=true will not be
rendered, though one with a null outline provider
(and thus no outline) will be.
Change-Id: Ic9549841b107b2eb51b417c66058a0cd69dd89eb
Sandeep Siddhartha [Wed, 23 Jul 2014 00:24:44 +0000 (00:24 +0000)]
Merge "Make hotword availability a callback" into lmp-dev
Alan Viverette [Wed, 23 Jul 2014 00:12:56 +0000 (17:12 -0700)]
Update spinner asset, fix default popup context and elevation
BUG:
15985882
Change-Id: Ica8c2597c35bd3012da11e315a93bbd1df2f3f38
Sandeep Siddhartha [Tue, 22 Jul 2014 16:49:49 +0000 (09:49 -0700)]
Make hotword availability a callback
This helps us make the list sound models operation an async one, it also helps us
with the case where a detector is invalidated, so the client doesn't have to keep checking the
state.
Synchronize DatabaseHelper methods on its instance so that other VoiceInteractionManagerService
calls aren't blocked on db writes/reads.
It's still possible for the list operation to be blocked on update and vice-versa
Change-Id: Ib8ec4ac5056b62d443038560ce31d0641b4627b0
Yao Chen [Wed, 23 Jul 2014 00:06:05 +0000 (00:06 +0000)]
Merge "Add thumbnail related api." into lmp-dev
Winson Chung [Wed, 23 Jul 2014 00:02:16 +0000 (17:02 -0700)]
Fixing animation when dismissing certain tasks.
Yao Chen [Tue, 22 Jul 2014 06:36:24 +0000 (23:36 -0700)]
Add thumbnail related api.
Change-Id: Ifcb06bbaf8f37df367f130124cbcef065fa25766
Chong Zhang [Tue, 22 Jul 2014 16:12:36 +0000 (09:12 -0700)]
update battery stats for audio/video
Bug:
12979595
Change-Id: I581376cb88a2d14dc4bad77d454b9bba73d0eb9b
Sreeram Ramachandran [Tue, 22 Jul 2014 23:45:05 +0000 (23:45 +0000)]
Merge "Cleanup: Delete dead code." into lmp-dev
Sreeram Ramachandran [Sun, 20 Jul 2014 06:21:46 +0000 (23:21 -0700)]
Cleanup: Delete dead code.
Bug:
15413389
Change-Id: I315468832ef18ffc84174e54774ab63b86d284dc
Christopher Tate [Tue, 22 Jul 2014 23:44:04 +0000 (23:44 +0000)]
Merge "Handle single-package restores properly" into lmp-dev
Christopher Tate [Tue, 22 Jul 2014 23:24:28 +0000 (16:24 -0700)]
Handle single-package restores properly
Bug
16346405
Change-Id: I69e3288f5a9d68d818fad6a2cd4b27ad45c1007e
John Spurlock [Tue, 22 Jul 2014 23:39:58 +0000 (23:39 +0000)]
Merge "BatterySaver: Make the bars orange." into lmp-dev
John Spurlock [Tue, 22 Jul 2014 20:15:08 +0000 (16:15 -0400)]
BatterySaver: Make the bars orange.
Bug:
16203820
Change-Id: I85f700d30a90212202626fc10fb289aca7f2b688
Andrew Lee [Tue, 22 Jul 2014 23:34:03 +0000 (23:34 +0000)]
Merge "Don't throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev
Winson Chung [Tue, 22 Jul 2014 23:30:37 +0000 (16:30 -0700)]
Always enable HW layers on task views. (Bug
15986310)
- Use color filter to apply dim to the task view layer
- Fixing bug where you would see a flash of the task view when animating out of Recents.
RoboErik [Tue, 22 Jul 2014 22:58:22 +0000 (15:58 -0700)]
Move return out of debug conditional
Accidentally put the return for not sending volume changes into
the debug conditional.
bug:
16379124
Change-Id: I473f6fdf7577ca26559ab9b02f4dc0613ef702e3
Andrew Lee [Tue, 22 Jul 2014 19:09:38 +0000 (12:09 -0700)]
Don't throw RemoteException in public RemoteCallVideoClient APIs.
- Hide constructor.
- No longer implements IBinder.DeathRecipient.
- Catch RemoteExceptions instead of throwing RemoteExceptions.
Change-Id: Iaa049cab9e24120d3ea732e1ede78cc6fcd0ad71
Andrew Lee [Tue, 22 Jul 2014 22:05:16 +0000 (22:05 +0000)]
Merge "Don't throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev
Jason Long [Tue, 22 Jul 2014 22:03:54 +0000 (22:03 +0000)]
Merge "Switched Holo to Material for account chooser activities." into lmp-dev
Adrian Roos [Tue, 22 Jul 2014 15:18:55 +0000 (17:18 +0200)]
Kill flashlight when launching the camera from lockscreen
Bug:
16357300
Change-Id: I6838ac405bb30047b076c8acb98bd124e8d00fd6
Adrian Roos [Tue, 22 Jul 2014 13:40:59 +0000 (15:40 +0200)]
QS: Hide flashlight tile if camera is busy
Currently behind a flag because the camera API for this not working
correctly yet.
Bug:
16357300
Change-Id: Ib10a2eafb1323fd611f38db03a2e0b4d7aa67db0
Jason Long [Tue, 10 Jun 2014 03:02:15 +0000 (20:02 -0700)]
Switched Holo to Material for account chooser activities.
Change-Id: I6a44fb174eb4e981c37fca0836b103d7ee3f5ffe
Robin Lee [Tue, 22 Jul 2014 15:47:40 +0000 (16:47 +0100)]
Stop double-loading device admins
loadSettingsLocked() was being called twice for USER_OWNER at
systemReady(), doubling the number of admin entries at every boot.
Also guards against double-adding admins which appear twice in the
same XML file, favouring more recently-refreshed entries for
backward compatibility.
Previously an application calling in with 'refreshing = true' would
double-insert whatever admin was being refreshed into its user's list
of device admins. This is fixed too.
@bug
16416936
Change-Id: Idd147aa130e6bce7bcc40532f0a7fb07117b3151
Paul Soulos [Tue, 22 Jul 2014 21:10:16 +0000 (14:10 -0700)]
Adds ScrollBounds to the Transition framework
Change-Id: If22ab5162737f2d109e5eaf407a735523a146b7f
Alan Viverette [Tue, 22 Jul 2014 20:09:32 +0000 (13:09 -0700)]
Make toolbarStyle public
BUG:
16486273
Change-Id: I2a9f3dbac536307cdd87ea0c50801c80ae96cd94
Robert Ly [Tue, 22 Jul 2014 21:00:07 +0000 (21:00 +0000)]
am
c12d7e3a: am
ff428e08: am
c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
* commit '
c12d7e3a3dc7b3f8df06f59d7fbeb2da84a1a493':
Doc change: add reminder for developers on using ad id.
David Friedman [Tue, 22 Jul 2014 20:55:55 +0000 (20:55 +0000)]
am
42dbe809: am
af001f94: am
170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
* commit '
42dbe80914b67841c2a8fe93fef8b80e58155684':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
Robert Ly [Tue, 22 Jul 2014 20:53:20 +0000 (20:53 +0000)]
am
ff428e08: am
c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
* commit '
ff428e08a5350153c5f9476551930b0eefdfcd06':
Doc change: add reminder for developers on using ad id.
David Friedman [Tue, 22 Jul 2014 20:49:09 +0000 (20:49 +0000)]
am
af001f94: am
170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
* commit '
af001f9410bf0a45282b2f0ab7c4c3bf77645697':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
Robert Ly [Tue, 22 Jul 2014 20:49:05 +0000 (20:49 +0000)]
am
c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
* commit '
c57c08298364e93ca4399d184bdba2657f72b11c':
Doc change: add reminder for developers on using ad id.
David Friedman [Tue, 22 Jul 2014 20:45:11 +0000 (20:45 +0000)]
am
170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
* commit '
170b09535d21c7c50051e391b8f7a61678872c2b':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
Scott Rowe [Tue, 22 Jul 2014 20:08:02 +0000 (20:08 +0000)]
am
2a922cb4: am
40b5d8a0: Merge "cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
* commit '
2a922cb45a0cb33ef575e39ac8ca4dc8500e03ba':
cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
Scott Rowe [Tue, 22 Jul 2014 20:03:19 +0000 (20:03 +0000)]
am
40b5d8a0: Merge "cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
* commit '
40b5d8a0e5aad92c07420541fd186f9f96495845':
cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
Andrew Solovay [Tue, 22 Jul 2014 19:08:45 +0000 (19:08 +0000)]
am
3968ae0f: am
eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
* commit '
3968ae0f70b01592c40c3e0cd31ca5ead953faa0':
DO NOT MERGE
Andrew Solovay [Tue, 22 Jul 2014 19:02:58 +0000 (19:02 +0000)]
am
eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
* commit '
eb69126c613dfd476fa516df6ae1c2d78e445f0b':
DO NOT MERGE
Andrew Solovay [Tue, 22 Jul 2014 18:47:26 +0000 (18:47 +0000)]
am
a2beba70: am
170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
* commit '
a2beba70b947a948c2a12513c8bdda4d403c2fd6':
docs: Removed reference to a sample notepad app.
Andrew Solovay [Tue, 22 Jul 2014 18:41:21 +0000 (18:41 +0000)]
am
170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
* commit '
170556f82bd009cf5a74a53d7ba61221d74d36e9':
docs: Removed reference to a sample notepad app.
Robert Ly [Tue, 22 Jul 2014 17:18:52 +0000 (17:18 +0000)]
am
fb8e254a: am
1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs
* commit '
fb8e254a1a66fc707a1c52d4cced699339f15685':
docs: update links and add new wear design materials
Robert Ly [Tue, 22 Jul 2014 17:18:47 +0000 (17:18 +0000)]
am
c9cf4521: am
0b5f9c2f: docs: remove android translation plugin doc
* commit '
c9cf452179ed6c413712607fd60ba2eaa910d95b':
docs: remove android translation plugin doc
Robert Ly [Tue, 22 Jul 2014 17:12:14 +0000 (17:12 +0000)]
am
1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs
* commit '
1c723ea84ee4299fa07687cb2881e3695bd14d3c':
docs: update links and add new wear design materials
Robert Ly [Tue, 22 Jul 2014 17:12:10 +0000 (17:12 +0000)]
am
0b5f9c2f: docs: remove android translation plugin doc
* commit '
0b5f9c2f6890ed8aa16d1cb630aa415bf7c908c0':
docs: remove android translation plugin doc
Robert Ly [Tue, 22 Jul 2014 15:05:33 +0000 (08:05 -0700)]
docs: remove android translation plugin doc
Change-Id: Ia21049e3250e98a419f5249693b218c1d5e58fd1
Baligh Uddin [Tue, 22 Jul 2014 16:48:12 +0000 (16:48 +0000)]
am
43f783fd: (-s ours) Import translations. DO NOT MERGE
* commit '
43f783fd7efd3b3d985a58bc3aa3e6136f976a14':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 21 Jul 2014 17:05:50 +0000 (10:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief6127337c9c4fdbbf15a6214a463822dc39b92c
Auto-generated-cl: translation import
Justin Koh [Tue, 22 Jul 2014 16:31:06 +0000 (16:31 +0000)]
am
a63272b4: Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev
* commit '
a63272b4b5eff16f4d6fae4730b8a7087563181c':
Revert "Wait for all windows to draw before turning screen on"
Chris Craik [Tue, 22 Jul 2014 20:52:25 +0000 (20:52 +0000)]
Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" into lmp-dev
henry.uh_chen [Thu, 3 Jul 2014 12:40:22 +0000 (20:40 +0800)]
[Bitmap] Add null pointer protection in Bitmap_sameAs()
Symptom: SkBitmap::getAddr(int, int) may return NULL due to unrecognized config
(ex: kRLE_Index8_Config). This will cause memcmp method to crash. Since bm0 and
bm1 both have pixel data() (have passed NULL == getPixels() check), those 2
bitmaps should be valid (only unrecognized), we return JNI_FALSE to warn user
those 2 unrecognized config bitmaps may be different.
Cherry-pick of
3a1bffa835f279628e50385af3c85789bc737f64 from AOSP
Change-Id: I6970c27de412110a3035d0a783112c4cd3ebc35b
Alexandra Gherghina [Tue, 15 Jul 2014 22:11:48 +0000 (23:11 +0100)]
Do Not Merge Per-user API for master sync
Change-Id: I6a8088eb3bfddae4c8e38904dd26baf3c7c09c9e
(cherry picked from commit
222aea8bd997807784dc99ca53f63280d384fdf0)
Scott Rowe [Tue, 22 Jul 2014 20:12:08 +0000 (20:12 +0000)]
am
6b2f3ee3: am
2a922cb4: am
40b5d8a0: Merge "cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
* commit '
6b2f3ee3b9954b4b834d6729265acd33ef232b9c':
cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
Robert Ly [Tue, 22 Jul 2014 17:07:51 +0000 (17:07 +0000)]
Merge "docs: update links and add new wear design materials" into klp-modular-docs
Robert Ly [Tue, 22 Jul 2014 17:06:17 +0000 (10:06 -0700)]
docs: update links and add new wear design materials
Change-Id: Idca24bcb64167b29c235380d0778d62cb1be6477
Igor Murashkin [Tue, 22 Jul 2014 20:11:11 +0000 (20:11 +0000)]
Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev
Igor Murashkin [Wed, 16 Jul 2014 00:19:49 +0000 (17:19 -0700)]
camera2: Add legacy available Request/Result/Characteristics keys
* Also changes the CameraMetadata#get*Keys to not return @hide keys
Change-Id: Ifc89153136a9be502b7b88addbd16a5de68a7bfc
Alan Viverette [Tue, 22 Jul 2014 20:07:02 +0000 (20:07 +0000)]
Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev
Alan Viverette [Tue, 22 Jul 2014 02:40:24 +0000 (19:40 -0700)]
Add popupTheme attr, propagate from ActionBar to ToolBar
BUG:
16347549
Change-Id: I934ec2469f8c136f750e2e2cf9b333e229393ac3
Andrew Solovay [Tue, 22 Jul 2014 19:15:58 +0000 (19:15 +0000)]
am
0ff1ecd1: (-s ours) am
3968ae0f: am
eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
* commit '
0ff1ecd1ece73db8d758f227db9d965ef9598f3b':
DO NOT MERGE
Eric Laurent [Mon, 21 Jul 2014 20:10:07 +0000 (13:10 -0700)]
AudioService: wait for init completed to handle media server restart
Bug:
16458506.
Change-Id: I25804e6e7209d52fd5dd6c622cae85d1e7d2317f
Andrew Solovay [Tue, 22 Jul 2014 18:53:11 +0000 (18:53 +0000)]
am
3a14c289: am
a2beba70: am
170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
* commit '
3a14c2890e9821a36399b042261d75ee4dfdf71f':
docs: Removed reference to a sample notepad app.
Sreeram Ramachandran [Tue, 22 Jul 2014 18:45:34 +0000 (18:45 +0000)]
Merge "Fix WiFi-Direct." into lmp-dev
Sreeram Ramachandran [Fri, 18 Jul 2014 00:09:07 +0000 (17:09 -0700)]
Fix WiFi-Direct.
Add a new command to let netd know about routes on a p2p interface.
Bug:
15413694
Change-Id: I36effc438d5ac193a77174493bf196cb68a5b97a
Craig Mautner [Mon, 21 Jul 2014 00:48:47 +0000 (17:48 -0700)]
Create API for launching from recents
Relaunch apps from recents using the same uid and package as was used
in the original launch.
Fixes bug
16358208.
Change-Id: I340800bfee79926b197929360d69f1d570bbf1eb
Craig Mautner [Tue, 22 Jul 2014 18:08:53 +0000 (11:08 -0700)]
Add empty ArrayList check.
Fixes bug
15768779.
Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd
Behdad Esfahbod [Tue, 15 Jul 2014 20:22:32 +0000 (16:22 -0400)]
Add android.Paint that inherits SkPaint
The idea is that extra paint parameters that only affect text layout
(not rendering) will go in android.Paint instead of going into
SkPaintOptionsAndroid. We will eventually move those out of SkPaint
too.
This is currently implemented in PaintImpl.cpp. Will be renamed when
current Paint.cpp that has JNI bits is moved to android_graphics_Paint.cpp.
Change-Id: Iba66c34dea5da503a13b9c864cb9f2211ac4ba7d
George Mount [Fri, 18 Jul 2014 22:41:13 +0000 (15:41 -0700)]
API Council: Change docs and constant names.
Bug
16401545
Changed doc for ChangeImageTransform.
Changed IN/OUT to MODE_IN/MODE_OUT.
Changed mode to flag attribute.
Change-Id: Ia2ae9930f9725871c9b1d80b758a3a0808a8f0c6
Robert Ly [Tue, 22 Jul 2014 17:27:08 +0000 (17:27 +0000)]
am
47495df6: am
fb8e254a: am
1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs
* commit '
47495df6a6797704919af3ea4a695cf7b2c53f00':
docs: update links and add new wear design materials
Robert Ly [Tue, 22 Jul 2014 17:27:00 +0000 (17:27 +0000)]
am
817a31af: am
c9cf4521: am
0b5f9c2f: docs: remove android translation plugin doc
* commit '
817a31afa3195b707526bb6d14339720d943549e':
docs: remove android translation plugin doc
Yin-Chia Yeh [Tue, 22 Jul 2014 17:23:18 +0000 (10:23 -0700)]
camera2: minor doc update
Doc update reflecting the minor spec change.
Change-Id: I7a1cf766fe6bee4dd08fd19f03778ce8a6ce2dde
Youngsang Cho [Tue, 22 Jul 2014 18:31:43 +0000 (18:31 +0000)]
Merge "Minor comment change of TvContract.Programs.COLUMN_TITLE" into lmp-dev
Youngsang Cho [Tue, 22 Jul 2014 17:57:00 +0000 (10:57 -0700)]
Minor comment change of TvContract.Programs.COLUMN_TITLE
Change-Id: I6592a0708feafc84cd76585428a9743e8fb2af48
Robert Ly [Tue, 22 Jul 2014 20:46:22 +0000 (20:46 +0000)]
Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
Dirk Dougherty [Sun, 22 Jun 2014 20:10:47 +0000 (13:10 -0700)]
Doc change: add reminder for developers on using ad id.
Change-Id: I6de92d091c469a4e81ec29c95ce65204f708fd97
David Friedman [Tue, 22 Jul 2014 20:42:05 +0000 (20:42 +0000)]
Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
destradaa [Tue, 22 Jul 2014 17:20:16 +0000 (17:20 +0000)]
Merge "Add uncertainty for GPS received TOW field. b/
16463499" into lmp-dev
Baligh Uddin [Tue, 22 Jul 2014 17:18:28 +0000 (17:18 +0000)]
am
d74d7397: (-s ours) am
43f783fd: (-s ours) Import translations. DO NOT MERGE
* commit '
d74d7397ef9fa085ae8a25a6c89eb9caccb43d40':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 22 Jul 2014 17:14:35 +0000 (10:14 -0700)]
Merge commit '
e959e4a0' into lmp-dev
Conflicts:
services/core/java/com/android/server/wm/WindowManagerService.java
destradaa [Tue, 22 Jul 2014 16:59:43 +0000 (09:59 -0700)]
Add uncertainty for GPS received TOW field.
b/
16463499
Change-Id: I5dde8a2737d9345eb7f77edc64ab7286254a65e4
Robert Ly [Tue, 22 Jul 2014 14:34:06 +0000 (14:34 +0000)]
am
4f67e66e: am
f3be7864: Merge "docs: fix speech code for bug
16461337" into klp-modular-docs
* commit '
4f67e66e3e6efd5805c54ef6ca0979c9b1f64d96':
docs: fix speech code for bug
16461337
Robert Ly [Tue, 22 Jul 2014 14:30:13 +0000 (14:30 +0000)]
am
f3be7864: Merge "docs: fix speech code for bug
16461337" into klp-modular-docs
* commit '
f3be7864a6cf1b98107de1eadf25587b53a90fca':
docs: fix speech code for bug
16461337
David Friedman [Tue, 22 Jul 2014 07:22:00 +0000 (00:22 -0700)]
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
Change-Id: I8d9077793dbe1dd345afd7152328018d818b07ce
Deepanshu Gupta [Tue, 22 Jul 2014 01:04:00 +0000 (01:04 +0000)]
am
9a61270d: Merge "LayoutLib: Fix EditText rendering [DO NOT MERGE]" into klp-modular-dev
* commit '
9a61270d67f654f3558b29f6b3e78c0b2fbe0178':
LayoutLib: Fix EditText rendering [DO NOT MERGE]
Deepanshu Gupta [Tue, 22 Jul 2014 01:03:55 +0000 (01:03 +0000)]
am
0ca0853c: Merge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev
* commit '
0ca0853c52a81b317996b2997373f5882b369c80':
Update layoutlib create README [DO NOT MERGE]
Dirk Dougherty [Tue, 22 Jul 2014 00:58:13 +0000 (00:58 +0000)]
am
d1929c50: am
f3659284: Doc change: add reminder for developers on using ad id.
* commit '
d1929c505a66afc13d661beac9868f2886cbd1e8':
Doc change: add reminder for developers on using ad id.
Dirk Dougherty [Tue, 22 Jul 2014 00:54:01 +0000 (00:54 +0000)]
am
f3659284: Doc change: add reminder for developers on using ad id.
* commit '
f365928406ef0a80d3aecc2d025642f9efb80a05':
Doc change: add reminder for developers on using ad id.
Dirk Dougherty [Sun, 22 Jun 2014 20:10:47 +0000 (13:10 -0700)]
Doc change: add reminder for developers on using ad id.
Change-Id: I2a6109bd1b97e4432e36c6a5055aee6e2b1c3edd
Carlos Valdivia [Fri, 18 Jul 2014 08:34:57 +0000 (01:34 -0700)]
Allow authenticators to rename accounts.
Bug:
16390602
Change-Id: I4f7250726a2c7677e0ccaa6e5f995153893d8360