OSDN Git Service
Chris Craik [Thu, 12 Jun 2014 16:54:18 +0000 (16:54 +0000)]
am
69453787: Merge "Fix race in shadow tessellation by deep copying task params" into lmp-preview-dev
* commit '
6945378752381a04d81eb426876a6495488cd459':
Fix race in shadow tessellation by deep copying task params
Dianne Hackborn [Thu, 12 Jun 2014 16:54:09 +0000 (16:54 +0000)]
am
0324f4b6: Merge "Fix calling startConfirmation instead of startCommand." into lmp-preview-dev
* commit '
0324f4b651e2e02319c580c16aee8d815a9beb24':
Fix calling startConfirmation instead of startCommand.
Selim Cinek [Thu, 12 Jun 2014 16:54:03 +0000 (16:54 +0000)]
am
0984a93c: Changed the visual appearance of the speedbump view.
* commit '
0984a93c5df33cc044a86e04e6dbe68d58027352':
Changed the visual appearance of the speedbump view.
Eino-Ville Talvala [Thu, 12 Jun 2014 16:53:54 +0000 (16:53 +0000)]
am
e941070b: Merge "Camera2: Misc + enum value documentation updates" into lmp-preview-dev
* commit '
e941070bd7ab910b558bbace38e2ff813fa0327c':
Camera2: Misc + enum value documentation updates
Robert Greenwalt [Thu, 12 Jun 2014 16:53:43 +0000 (16:53 +0000)]
am
fe5ca964: (-s ours) Merge "Fix public API of LinkProperties." into lmp-preview-dev
* commit '
fe5ca9646f86e041ed7729ecd0a006428806acf2':
Fix public API of LinkProperties.
Selim Cinek [Wed, 11 Jun 2014 18:03:14 +0000 (20:03 +0200)]
Changed the visual appearance of the speedbump view.
The colorfulldots are replaced by a simple line to avoid
catching too much attention.
Bug:
15188625
Change-Id: I41be50dcc61d495f3bc88e4731388f770fda83d0
Eino-Ville Talvala [Wed, 11 Jun 2014 19:25:09 +0000 (19:25 +0000)]
Merge "Camera2: Misc + enum value documentation updates" into lmp-preview-dev
Chris Craik [Wed, 11 Jun 2014 21:01:19 +0000 (21:01 +0000)]
Merge "Fix race in shadow tessellation by deep copying task params" into lmp-preview-dev
Chris Craik [Wed, 11 Jun 2014 20:44:19 +0000 (13:44 -0700)]
Fix race in shadow tessellation by deep copying task params
bug:
15369119
Change-Id: Ica1445f06693b1cfd038cf3494afe1210d5507c1
Robert Greenwalt [Wed, 11 Jun 2014 19:11:34 +0000 (19:11 +0000)]
Merge "Fix public API of LinkProperties." into lmp-preview-dev
Robert Greenwalt [Fri, 6 Jun 2014 17:30:11 +0000 (10:30 -0700)]
Fix public API of LinkProperties.
bug:
15142362
(cherry picked from commit
51d898fd0223a4b7c728980ab987dd985c02df5f)
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
Ruben Brunk [Wed, 11 Jun 2014 00:09:36 +0000 (00:09 +0000)]
Merge "DO NOT MERGE: camera2: Disallow shim usage for preview." into lmp-preview-dev
Dianne Hackborn [Wed, 11 Jun 2014 20:37:17 +0000 (20:37 +0000)]
Merge "Fix calling startConfirmation instead of startCommand." into lmp-preview-dev
Dianne Hackborn [Wed, 11 Jun 2014 20:23:18 +0000 (13:23 -0700)]
Fix calling startConfirmation instead of startCommand.
Duh!
Change-Id: Ia9785a1ab37e38b7a044c2d389a1015a209654c9
Eino-Ville Talvala [Wed, 11 Jun 2014 00:04:08 +0000 (00:04 +0000)]
Merge "Camera2: Many docs updates" into lmp-preview-dev
Robert Greenwalt [Tue, 10 Jun 2014 23:30:34 +0000 (23:30 +0000)]
Merge "Apply API review to android.net.Network:" into lmp-preview-dev
Paul Jensen [Thu, 29 May 2014 14:12:39 +0000 (10:12 -0400)]
Apply API review to android.net.Network:
- socketFactory() renamed to getSocketFactory()
- Make sure bindProcess() documentation points developers to getSocketFactory() as the preferred approach
- Move bindProcess() and unbindProcess() to ConnectivityManager.setProcessBoundNetwork() -- passing null clears it.
- Move getProcessBoundNetwork() to ConnectivityManager.getProcessBoundNetwork().
Bug:
15142362
Bug:
13885501
Change-Id: Ia55c59d52e1ec8bf10dd0d9d037bd04c0998bc71
(cherry picked from commit
5ca1e6675bf4182b6e9ca76a7696bf2e38e96c4f)
Eino-Ville Talvala [Mon, 9 Jun 2014 21:25:50 +0000 (14:25 -0700)]
Camera2: Misc + enum value documentation updates
- Update enum values for many entries
- Reword various sections of documentation for clarity.
Bug:
15475465
Change-Id: I2b03cac8d478e945c7d93717845a9ae44b97639b
Dianne Hackborn [Wed, 11 Jun 2014 17:42:35 +0000 (17:42 +0000)]
Merge "Implement control of auto power save mode." into lmp-preview-dev
Dianne Hackborn [Wed, 11 Jun 2014 06:13:02 +0000 (23:13 -0700)]
Implement control of auto power save mode.
Follow the setting for auto power save mode in both
battery service and battery UI. Default level is 15 when
setting is not set; otherwise it is whatever the setting
gives, with 0 meaning auto battery save is off.
Change how we define the "turn off warn" level to be
an adjustment from the warn level, so we can have a good
value for whatever auto setting is set.
Fix power manager to never go in to power save mode when
plugged in, even if the user has manually turned it on.
Add new delete option to settings command, because I needed
it for testing.
Change-Id: I512b691df84399d50b8e751fd50732c6093ebe85
Matthew Williams [Tue, 10 Jun 2014 23:22:47 +0000 (23:22 +0000)]
Merge "Fix battery controller non-fire bug" into lmp-preview-dev
Matthew Williams [Tue, 10 Jun 2014 19:59:29 +0000 (12:59 -0700)]
Fix battery controller non-fire bug
Receiver wasn't registered to listen for the action coming
back from the Alarm Manager.
Also, if a task starts being tracked by the battery controller
and the device is on power, the batt. controller will notify
the scheduler as such.
Added dumpsys for battery controller to help debugging.
Change-Id: I7ce305b816aea69e8d05a3daf23124c163546788
Matthew Williams [Tue, 10 Jun 2014 23:06:13 +0000 (16:06 -0700)]
Fix build.
Two tests were breaking the build.
Change-Id: If424a552d3fedb912fa94870b88c60dc3750b69a
Dianne Hackborn [Wed, 11 Jun 2014 17:20:58 +0000 (17:20 +0000)]
Merge "Some tweaks to improve document task creation." into lmp-preview-dev
Dianne Hackborn [Wed, 11 Jun 2014 04:36:35 +0000 (21:36 -0700)]
Some tweaks to improve document task creation.
- Mark the chooser activity as never launching in to a new
task, even if the caller asks for it. These are dialogs
so don't make sense as stand-alone tasks. (Maybe later
the policy should be to not launch into a new task in any
case that the activity is a dialog or even transparent at all.)
- Keep track in the task record of whether any activities in
it have been shown to the user, and use this to automatically
remove the task when all activities finish. This leans up
cases where apps are launching stub activities that get turned
in to tasks but are never seen by the user because they
immediately launch another activity in another task and
then finish.
Change-Id: I00b641c80aa96bd5071479f36ee2e4d8e3a81aeb
Winson Chung [Tue, 10 Jun 2014 22:00:10 +0000 (22:00 +0000)]
Merge "Updating Recents to make the cards slightly more visible." into lmp-preview-dev
Christopher Tate [Tue, 10 Jun 2014 22:31:31 +0000 (22:31 +0000)]
Merge "Fix build" into lmp-preview-dev
Christopher Tate [Tue, 10 Jun 2014 22:20:49 +0000 (15:20 -0700)]
Fix build
Change-Id: I339f7f1ab82af699ee34c3baf824d0278477a4cf
Robert Phillips [Thu, 12 Jun 2014 16:12:34 +0000 (16:12 +0000)]
Merge "Update Picture documentation Enhanced comment"
Vinit Deshpande [Mon, 9 Jun 2014 22:39:22 +0000 (15:39 -0700)]
Support scanning using band specification instead of channels
This change enables scanning with band specification instead of channels,
this should ease app development.
Also includes a bug fix for parcel serialization/deserialization.
Change-Id: Idbffce4805b403bf8fe1efae999cb828e09c2420
Vinit Deshpande [Tue, 3 Jun 2014 22:55:36 +0000 (15:55 -0700)]
Fix an NPE in WifiScanner while reporting description
Change-Id: Ie9d12e19e0b8ca98c6ec4c6fa5222a2f28983e64
Svetoslav [Wed, 11 Jun 2014 01:59:30 +0000 (18:59 -0700)]
Moving and resizing windows not reported propely for accessibility.
When the position and size of a window changes we have to report that
to the accessibility layer if the window introspection is enabled.
bug:
15569915
Change-Id: I3f869e0a582592bfa5f3743d5c2133ee8cb39b34
Nicolas Prevot [Thu, 12 Jun 2014 15:23:38 +0000 (15:23 +0000)]
am
485303e2: Merge "Correcting a bug related to Uri permissions." into lmp-preview-dev
* commit '
485303e2e45ca91287400b0b26e1e737062c8839':
Correcting a bug related to Uri permissions.
John Reck [Thu, 12 Jun 2014 15:23:32 +0000 (15:23 +0000)]
am
82469fb2: (-s ours) Merge "DO NOT MERGE Disable AtlasInitializer" into lmp-preview-dev
* commit '
82469fb2aa173e307c0c92ccdf9db30316502813':
DO NOT MERGE Disable AtlasInitializer
Mark Salyzyn [Thu, 12 Jun 2014 14:39:00 +0000 (14:39 +0000)]
Merge "hwui: 64-bit compile issue"
Andy McFadden [Thu, 12 Jun 2014 14:21:51 +0000 (14:21 +0000)]
Merge "Delete a local ref in getSurface"
Andy McFadden [Wed, 11 Jun 2014 22:22:32 +0000 (15:22 -0700)]
Delete a local ref in getSurface
ANativeWindow_fromSurface() provides a native-only call path to
android_view_Surface_getSurface(), so we need to clean up the
local reference.
Bug
14087233
Change-Id: I92aa5aa492c47a0642fdcb28c717ad7f874e1ad9
John Reck [Wed, 11 Jun 2014 18:12:09 +0000 (18:12 +0000)]
Merge "DO NOT MERGE Disable AtlasInitializer" into lmp-preview-dev
John Reck [Fri, 6 Jun 2014 16:38:54 +0000 (09:38 -0700)]
DO NOT MERGE Disable AtlasInitializer
Bug:
15425820
Change-Id: I15270eb7a5856523625e2de48ef9efc2520ddb0f
John Spurlock [Wed, 11 Jun 2014 17:07:53 +0000 (17:07 +0000)]
Merge "SystemUI asset update." into lmp-preview-dev
John Spurlock [Wed, 11 Jun 2014 14:59:11 +0000 (10:59 -0400)]
SystemUI asset update.
- Updated location icons.
- Updated no-sim, plumb up to QS.
- Updated zen mode synthetic notification icon.
- Updated color inversion icons.
Change-Id: I4849fbe11683feab37160c3d23502b01035de66a
justinzhang [Mon, 12 May 2014 21:06:01 +0000 (17:06 -0400)]
Hide status bars in lock task
Call StatusBarManager to show/hide status bars for lock task.
(Same CL as https://googleplex-android-review.git.corp.google.com/#/c/461068/,
sorry for the confusion.)
Bug:
13669575
Change-Id: I5c90bdb1d868aa02d3679e854b5ccbe434d996d6
(cherry picked from commit
cc2365ac9eae0393154c863a21286c9a95311e15)
Jessica Hummel [Wed, 21 May 2014 11:32:57 +0000 (12:32 +0100)]
Update documentation so it meets api requirements
Change-Id: Ice52dc3d5ecca77f81d3df1b43179c94aece6fef
bug:
15023443
Conflicts:
api/current.txt
core/java/android/app/admin/DeviceAdminReceiver.java
Florin Malita [Thu, 12 Jun 2014 13:08:07 +0000 (13:08 +0000)]
Merge "Pass full matrix + clip save flags to the native SkCanvas."
Przemyslaw Szczepaniak [Thu, 12 Jun 2014 10:50:25 +0000 (11:50 +0100)]
Add missing copyright headers in speech.tts
Change-Id: Icf1c3cf71ac45cb00606c8034af375e657c31ea5
Dan Sandler [Wed, 11 Jun 2014 18:00:27 +0000 (18:00 +0000)]
Merge "NotificationListenerService: API updates" into lmp-preview-dev
Christoph Studer [Wed, 4 Jun 2014 14:36:01 +0000 (16:36 +0200)]
NotificationListenerService: API updates
Introduce RankingMap holding single notification Rankings
indexed by SBN keys.
Also, pass RankingMap with notification event callbacks so
subclasses don't have to call getCurrentRanking() unnecessarily.
Bug:
15415840
Change-Id: Id41e174f00c06c86359c03646abc3db78028b324
Jorim Jaggi [Wed, 11 Jun 2014 14:51:14 +0000 (14:51 +0000)]
Merge "Fix blank lockscreen." into lmp-preview-dev
Jorim Jaggi [Wed, 11 Jun 2014 01:22:39 +0000 (03:22 +0200)]
Fix blank lockscreen.
Bug:
15281241
Change-Id: If315891274a97fa5cc579554b83b85cf3c87f0fb
Daniel Sandler [Thu, 5 Jun 2014 06:54:26 +0000 (02:54 -0400)]
Clean up progress bars for media & other notifications.
Bug:
15147533
Change-Id: Ib4905203c004232bd7d78fe9fa316aa5688eaaa2
Chris Wren [Wed, 11 Jun 2014 14:44:00 +0000 (14:44 +0000)]
Merge "Only post interrupting notifications to the Heads Up." into lmp-preview-dev
George Mount [Wed, 11 Jun 2014 14:11:30 +0000 (14:11 +0000)]
Merge "DO NOT MERGE Allow enter activity transitions to be delayed until data is ready." into lmp-preview-dev
George Mount [Tue, 10 Jun 2014 18:12:01 +0000 (11:12 -0700)]
DO NOT MERGE Allow enter activity transitions to be delayed until data is ready.
Bug
15539194
Change-Id: I8de9806b0bcdf8129eb3b5a555a2433f0c7be634
John Spurlock [Wed, 11 Jun 2014 03:16:57 +0000 (03:16 +0000)]
Merge "Brightness slider no longer displays the automatic icon." into lmp-preview-dev
John Spurlock [Tue, 10 Jun 2014 23:26:14 +0000 (19:26 -0400)]
Brightness slider no longer displays the automatic icon.
Bug:
15414855
Change-Id: I3a1b8e7758e41abd172c20177f42452077bfc7a7
Svetoslav [Wed, 11 Jun 2014 01:49:34 +0000 (01:49 +0000)]
Merge "Accessibility window changes not reported." into lmp-preview-dev
Svetoslav [Wed, 11 Jun 2014 01:00:12 +0000 (18:00 -0700)]
Accessibility window changes not reported.
On accessibility service side we were asking only for cached windows but since
to optimize performance the system is sending only deltas for windows the service
already introspected, new windows were not seen by the accessibility service.
bug:
15092286
Change-Id: I7e9c360f624c53ff1773c485a8907dc425e3352a
Deepanshu Gupta [Wed, 11 Jun 2014 01:31:52 +0000 (01:31 +0000)]
Merge "Remove lxml dependency." into lmp-preview-dev
Deepanshu Gupta [Tue, 10 Jun 2014 21:43:23 +0000 (14:43 -0700)]
Remove lxml dependency.
The encoding for the .ttx file generated is now hard-coded to be utf-8.
Change-Id: I71c208327995651fcf44b6961510f84bafb05848
Deepanshu Gupta [Wed, 11 Jun 2014 01:31:38 +0000 (01:31 +0000)]
Merge "LayoutLib: Support more ContextThemeWrappers" into lmp-preview-dev
Deepanshu Gupta [Tue, 10 Jun 2014 02:55:41 +0000 (19:55 -0700)]
LayoutLib: Support more ContextThemeWrappers
ContextThemeWrapper may be the base context for another
ContextThemeWrapper. We now extract the base context till we reach the
final context.
Change-Id: I034444a2d1579241543fd24248530b299e72498a
Deepanshu Gupta [Tue, 10 Jun 2014 01:57:18 +0000 (18:57 -0700)]
LayoutLib: Fix EditText rendering
Framework has overloaded java.lang.System.arraycopy() for char[]. The
method is not present on the Desktop VMs. This change replaces the calls
to this method by its more general alternative - the one using Objects.
TODO: Make it more configurable and flexible to allow rewrite of any
such methods in the future.
Change-Id: I6823b13e52b1c555eb257d02b79707d84e73236f
Deepanshu Gupta [Wed, 11 Jun 2014 01:31:29 +0000 (01:31 +0000)]
Merge "LayoutLib: Fix EditText rendering" into lmp-preview-dev
Christopher Tate [Wed, 11 Jun 2014 01:22:24 +0000 (01:22 +0000)]
Merge "Hide the (obsolescent) android.app.maintenance APIs" into lmp-preview-dev
Christopher Tate [Wed, 11 Jun 2014 00:49:08 +0000 (17:49 -0700)]
Hide the (obsolescent) android.app.maintenance APIs
Bug
14994893
Change-Id: If3c06de006504e81c37eb6b716d613e5124d28bc
Lorenzo Colitti [Wed, 11 Jun 2014 01:18:50 +0000 (01:18 +0000)]
Merge "Don't enable Ethernet on the emulator." into lmp-preview-dev
Robin Lee [Thu, 12 Jun 2014 10:59:23 +0000 (10:59 +0000)]
Merge "More meaningful errors for DPM calls by non-owners"
Jae Seo [Thu, 12 Jun 2014 06:41:21 +0000 (06:41 +0000)]
Merge "Add channel types for NTSC, PAL and SECAM"
Jae Seo [Thu, 12 Jun 2014 00:33:51 +0000 (17:33 -0700)]
Add channel types for NTSC, PAL and SECAM
Bug:
14451655, Bug:
15321686
Change-Id: I2618fb79a4b20898c95cea22154379738710da44
vandwalle [Thu, 12 Jun 2014 00:21:22 +0000 (17:21 -0700)]
reset counters when disconnecting
Change-Id: If19d97d481a93343cf9792ff77bf9926ae5c26a7
Elliott Hughes [Thu, 12 Jun 2014 00:15:38 +0000 (00:15 +0000)]
am
b9525871: am
8525fe8d: am
1a3908e9: Merge "Switch to a type-safe album art interface."
* commit '
b952587184572070805243e6f8380ceb769f441c':
Switch to a type-safe album art interface.
Craig Mautner [Thu, 12 Jun 2014 00:12:59 +0000 (17:12 -0700)]
Merge commit '
f5030ecb' into manualmerge
Conflicts:
services/core/java/com/android/server/am/ActivityStack.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java
Change-Id: Ie38e3e8b82f588d36e955664904f3ab84bdfaaf5
Elliott Hughes [Thu, 12 Jun 2014 00:06:20 +0000 (00:06 +0000)]
am
8525fe8d: am
1a3908e9: Merge "Switch to a type-safe album art interface."
* commit '
8525fe8d0a5a886704307055ef211fc911997783':
Switch to a type-safe album art interface.
Dan Sandler [Thu, 12 Jun 2014 00:04:01 +0000 (00:04 +0000)]
am
54c4c19b: Merge "NotificationListenerService: API updates" into lmp-preview-dev
* commit '
54c4c19bc95e839cfce3d10f0e842ed5588391eb':
NotificationListenerService: API updates
Dianne Hackborn [Thu, 12 Jun 2014 00:03:55 +0000 (00:03 +0000)]
am
6d758619: Merge "Implement control of auto power save mode." into lmp-preview-dev
* commit '
6d758619d90a0dda7f1136dcd44d0ac02cdada7e':
Implement control of auto power save mode.
Dianne Hackborn [Thu, 12 Jun 2014 00:03:48 +0000 (00:03 +0000)]
am
f894cad0: Merge "Some tweaks to improve document task creation." into lmp-preview-dev
* commit '
f894cad093c1a3083f4aca099babc4677977a12f':
Some tweaks to improve document task creation.
John Spurlock [Thu, 12 Jun 2014 00:03:40 +0000 (00:03 +0000)]
am
a6522c40: Merge "SystemUI asset update." into lmp-preview-dev
* commit '
a6522c40e44c9b8c6dc551ab05c7b0ddfbfdac75':
SystemUI asset update.
justinzhang [Thu, 12 Jun 2014 00:03:33 +0000 (00:03 +0000)]
am
8b00d123: (-s ours) Hide status bars in lock task
* commit '
8b00d123ec3154482644d2ebe913326552b47321':
Hide status bars in lock task
Elliott Hughes [Thu, 12 Jun 2014 00:02:42 +0000 (00:02 +0000)]
am
1a3908e9: Merge "Switch to a type-safe album art interface."
* commit '
1a3908e95926acd8add3858be571fe23fa9d047a':
Switch to a type-safe album art interface.
Craig Mautner [Thu, 12 Jun 2014 00:00:17 +0000 (00:00 +0000)]
am
4a9f1298: Close ActivityView and ActivityContainer cleanly.
* commit '
4a9f129874785d34930f165268dbc618e4bc2618':
Close ActivityView and ActivityContainer cleanly.
Craig Mautner [Wed, 11 Jun 2014 20:44:50 +0000 (13:44 -0700)]
Close ActivityView and ActivityContainer cleanly.
- Do not call IActivityContainer.release() from
ActivityView.finalize() if it has already been called from
ActivityView.release(). Eliminates IBinder finalized Exception.
- Call ActivityRecord.makeFinishing() before calling ActivityStack.
destroyActivityLocked(). Forces call to scheduleDestroyActivity()
and eventually removeFromHistory(). Otherwise removeFromHistory()
is never called and window manager AppWindowTokens become orphans.
- Defer call to ActivityContainer.detachLocked() until all
activities have finished or timed out. Fixes problem where Display
is removed while activities are still launching.
- Call ActivityStackSupervisor.deleteActivityContainer() when all
activities have finished or timed out. Fixes orphaned
ActivityContainers.
Fixes bug
15450798.
Fixes bug
15484154.
Fixes bug
15383479.
Fixes bug
15316558.
Fixes bug
15168560.
Fixes bug
15143914.
Change-Id: Id3c641976b6f825458690f9ee063c07818b56f23
vandwalle [Wed, 11 Jun 2014 23:32:19 +0000 (23:32 +0000)]
Merge "auto-roam initial implementation"
Sol Boucher [Wed, 11 Jun 2014 23:26:00 +0000 (23:26 +0000)]
Merge "Add CameraToo, a sample point-and-shoot camera app"
Sol Boucher [Wed, 4 Jun 2014 23:05:55 +0000 (16:05 -0700)]
Add CameraToo, a sample point-and-shoot camera app
It demonstrates basic use of the features of the new Camera2 API.
Change-Id: I593bc682e5c6203754e9a3ee9a78efbd1b208513
Craig Mautner [Wed, 11 Jun 2014 21:38:49 +0000 (21:38 +0000)]
am
28084383: am
e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev
* commit '
28084383c13660864f75452f99183c377c2798ec':
Add NO_ANIMATION flag to ActivityView Intents.
Calin Juravle [Wed, 11 Jun 2014 21:38:43 +0000 (21:38 +0000)]
am
cdd1fd7a: am
b0492d69: am
16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"
* commit '
cdd1fd7a8f88e6d99e773b2fb867dbf1d6c64eb9':
Shrink profiler.start-immediately to fit in the maximum property size
Calin Juravle [Wed, 11 Jun 2014 21:38:38 +0000 (21:38 +0000)]
am
5fc4e487: am
b0f59cdc: am
2f84b69b: Merge "Improved profile.start-immediately comment"
* commit '
5fc4e487420b7730c9eaf2623ff1efd2633daba7':
Improved profile.start-immediately comment
vandwalle [Wed, 11 Jun 2014 03:47:58 +0000 (20:47 -0700)]
auto-roam initial implementation
Change-Id: Iad207974b2fea97420cc6131c5fa0a1f17bf2aac
Kenny Root [Wed, 11 Jun 2014 21:31:56 +0000 (14:31 -0700)]
resolved conflicts for merge of
579ace03 to master
Change-Id: I461879359824036ec861ad9b5b8804ae814179a9
Craig Mautner [Wed, 11 Jun 2014 17:42:06 +0000 (17:42 +0000)]
am
e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev
* commit '
e33010a261d881426ce0af9a9e2177137ec3f6b9':
Add NO_ANIMATION flag to ActivityView Intents.
Calin Juravle [Wed, 11 Jun 2014 17:32:50 +0000 (17:32 +0000)]
am
b0492d69: am
16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"
* commit '
b0492d6943fc590c2569dd2fc393db54a73986d3':
Shrink profiler.start-immediately to fit in the maximum property size
Calin Juravle [Wed, 11 Jun 2014 17:32:40 +0000 (17:32 +0000)]
am
b0f59cdc: am
2f84b69b: Merge "Improved profile.start-immediately comment"
* commit '
b0f59cdcb4d2205faa3811277163bbf215b68dfc':
Improved profile.start-immediately comment
Calin Juravle [Wed, 11 Jun 2014 17:28:33 +0000 (17:28 +0000)]
am
16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"
* commit '
16719591f4a6b2139b1f3555dcde92d35f488b6a':
Shrink profiler.start-immediately to fit in the maximum property size
Calin Juravle [Wed, 11 Jun 2014 17:28:29 +0000 (17:28 +0000)]
am
2f84b69b: Merge "Improved profile.start-immediately comment"
* commit '
2f84b69bf5afcf67469704e30866067b770ae786':
Improved profile.start-immediately comment
Robin Lee [Wed, 11 Jun 2014 16:39:45 +0000 (17:39 +0100)]
More meaningful errors for DPM calls by non-owners
Now throws an exception titled something like "Admin X does not own the
profile" instead of the rather unhelpful NullPointerException that was
thrown previously.
Change-Id: I33f6da5ea5eb70d8ea3939cfa280c794b01c3382
Craig Mautner [Wed, 11 Jun 2014 17:39:19 +0000 (17:39 +0000)]
Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev
Griff Hazen [Wed, 11 Jun 2014 01:18:36 +0000 (01:18 +0000)]
am
9f637d10: Reduce notification service historical archive size to 1 for watches. To remove the memory footprint
* commit '
9f637d10959490c3a28e0f40330e97eb67e954d7':
Reduce notification service historical archive size to 1 for watches. To remove the memory footprint
Griff Hazen [Tue, 10 Jun 2014 18:13:51 +0000 (11:13 -0700)]
Reduce notification service historical archive size to 1 for watches.
To remove the memory footprint
Bug:
15536759
Change-Id: I081bd962fef689b5d8ed126208499d56ebf4ae38
George Mount [Wed, 11 Jun 2014 20:49:58 +0000 (20:49 +0000)]
Merge "Prevent transitions from calling createAnimator for invalid views."
George Mount [Thu, 5 Jun 2014 23:47:47 +0000 (16:47 -0700)]
Prevent transitions from calling createAnimator for invalid views.
Bug
15285527
When two transitions affect different views, createAnimator is
on all Transitions for all views. This CL prevents createAnimator
from being called for Transitions that don't target a view.
Change-Id: I3f70a13b4ea38ad4a9b4724db438b40f6e80eafb