OSDN Git Service
Jeff Brown [Sat, 20 Sep 2014 01:09:07 +0000 (01:09 +0000)]
Merge "Fix order of operations while pulsing the ambient display." into lmp-dev
Jeff Brown [Sat, 20 Sep 2014 01:08:51 +0000 (01:08 +0000)]
Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev
Christopher Tate [Sat, 20 Sep 2014 00:25:11 +0000 (00:25 +0000)]
Merge "Always give wifi a chance to quiet down during restore" into lmp-dev
Dianne Hackborn [Sat, 20 Sep 2014 00:22:51 +0000 (00:22 +0000)]
Merge "Fix issue #
17492300: NavUtils.shouldUpRecreateTask returns different..." into lmp-dev
Dianne Hackborn [Sat, 20 Sep 2014 00:21:46 +0000 (17:21 -0700)]
Fix issue #
17492300: NavUtils.shouldUpRecreateTask returns different...
...value in L
Only do the new logic when the task is a document.
Change-Id: I4664b94a3fe86ea266c2feb4e889c14c06751a15
Christopher Tate [Sat, 20 Sep 2014 00:03:59 +0000 (17:03 -0700)]
Always give wifi a chance to quiet down during restore
Not just when the current scan-always setting is on.
Bug
17571997
Change-Id: Idc56c9682c18f5e23c0bde98736522a79583af5e
Svetoslav [Sat, 20 Sep 2014 00:02:45 +0000 (00:02 +0000)]
Merge "TouchExploer computes incorectly the click location." into lmp-dev
Svetoslav [Fri, 19 Sep 2014 22:37:02 +0000 (15:37 -0700)]
TouchExploer computes incorectly the click location.
If there is accessibilty focus and the user touch explores
location that does not change accessibility focus that is
not in the app window, e.g. system bar, double tap does not
click on the system UI affordance. This is due to obsolete
logic from the time where accessibility focus was only in
the active window at the time of double clicking.
bug:
17588024
Change-Id: Ib780103e873d8a2afd3b35de3227d54116f1a1b0
Chris Craik [Fri, 19 Sep 2014 23:36:20 +0000 (23:36 +0000)]
Merge "Account for alpha in hasShadow()" into lmp-dev
Dianne Hackborn [Fri, 19 Sep 2014 23:26:16 +0000 (23:26 +0000)]
Merge "Fix issue #
17574819: Chrome browser process is killed in background..." into lmp-dev
Dianne Hackborn [Fri, 19 Sep 2014 23:24:18 +0000 (23:24 +0000)]
Merge "Work on issue #
17381033: Program icon and shortcut disappear after..." into lmp-dev
Dianne Hackborn [Fri, 19 Sep 2014 23:16:04 +0000 (16:16 -0700)]
Work on issue #
17381033: Program icon and shortcut disappear after...
...running monkey test overnight [FACTORY ROM BLOCKER]
Add surface tracing to debug output.
Change-Id: I65f7fc90c51b0805f7e0090141c33d6b60ccb3b4
Amit Mahajan [Fri, 19 Sep 2014 23:12:57 +0000 (23:12 +0000)]
Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev
Hui Wang [Fri, 19 Sep 2014 21:20:44 +0000 (16:20 -0500)]
Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
Bug:
17567651,
16308209
Change-Id: Ie164b16b70429d5815e9bef5f8c5489f6e49de36
Chris Craik [Fri, 19 Sep 2014 23:04:45 +0000 (16:04 -0700)]
Account for alpha in hasShadow()
bug:
17587220
Change-Id: Ic7f2dea95302b713dc93edb4a0193a7be77fb2eb
Christopher Tate [Fri, 19 Sep 2014 22:44:13 +0000 (15:44 -0700)]
Logspam is spam
This turns out to happen a lot in normal usage, but we're logging
copiously about it each time. It's reporting "oh hey we're already
in this state" -- and so the log is not useful anyway.
Logspam is spam.
Bug
15169507
Change-Id: Ie2d01ff1b0b3600dd9c15ccf83d60875558f1dc2
Alan Viverette [Fri, 19 Sep 2014 22:28:07 +0000 (22:28 +0000)]
Merge "Update theme colors for better contrast and de-blueing" into lmp-dev
Alan Viverette [Fri, 19 Sep 2014 22:19:01 +0000 (22:19 +0000)]
Merge "Correctly apply max width/height to preference icons" into lmp-dev
Alan Viverette [Fri, 19 Sep 2014 20:28:14 +0000 (13:28 -0700)]
Update theme colors for better contrast and de-blueing
BUG:
17520824
Change-Id: Id9f90136cea169ba9e58db957034c539ef25121f
Dianne Hackborn [Fri, 19 Sep 2014 22:09:39 +0000 (15:09 -0700)]
Fix issue #
17574819: Chrome browser process is killed in background...
...due to dying renderer process
Don't kill processes if they are bound to a service but not impacting
oom adjustment.
Change-Id: I1cc44e633feaeaad6e996b79a6cfd7b386c04095
Svetoslav [Fri, 19 Sep 2014 21:41:38 +0000 (21:41 +0000)]
Merge "Keep existing API behavior that regressed." into lmp-dev
Dianne Hackborn [Fri, 19 Sep 2014 21:41:38 +0000 (21:41 +0000)]
Merge "Add new activity dumpsys command to persist all data." into lmp-dev
Svetoslav [Fri, 19 Sep 2014 21:41:11 +0000 (21:41 +0000)]
Merge "Fix a print spooler crash when printing." into lmp-dev
Svetoslav [Fri, 19 Sep 2014 21:24:30 +0000 (14:24 -0700)]
Fix a print spooler crash when printing.
The spooler communicates with he remote PDF renderer asynchronously.
When print is confirmed we close the renderer, destroy it, and unbind
from its service. If we unbind from the service after the print activiy
is finished we get a crash. The bug was that we did not wait until we
disconnect from the remote renderer before finishing the print activity.
bug:
17583115
Change-Id: I55b0135f9c5658b3a4fda2901b8b3bdef044e211
George Mount [Fri, 19 Sep 2014 21:01:14 +0000 (21:01 +0000)]
Merge "Target only shared elements with shared element Transition" into lmp-dev
Svetoslav [Fri, 19 Sep 2014 20:21:55 +0000 (13:21 -0700)]
Keep existing API behavior that regressed.
If RemoteViews get a null package in the constructor we are
using the context in which they are applied to obtain resources
during inflation. In such a case if we call the getPackage()
method we were getting null, i.e. the package passed in the
contructor, but now we are returning the package if the app
that created the remote views.
bug:
17513823
Change-Id: I0c4a8953c8320469a9160dbaae46ce31465b313b
Jeff Sharkey [Fri, 19 Sep 2014 20:58:43 +0000 (20:58 +0000)]
Merge "Fix bugs when system apps reclaim permissions." into lmp-dev
Alan Viverette [Fri, 19 Sep 2014 20:51:13 +0000 (20:51 +0000)]
Merge "Fix action bar title size consistency" into lmp-dev
Alan Viverette [Fri, 19 Sep 2014 20:36:29 +0000 (13:36 -0700)]
Correctly apply max width/height to preference icons
BUG:
17581750
Change-Id: I8ad21a321c80f0a657670ba4d175d0ebecea49ef
Adam Powell [Fri, 19 Sep 2014 20:31:12 +0000 (20:31 +0000)]
Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev
Jeff Brown [Thu, 18 Sep 2014 22:27:50 +0000 (15:27 -0700)]
Fix order of operations while pulsing the ambient display.
This change fixes several issues in how the display's power state
was coordinated to ensure that the display is not turned on until
the pulse is ready to be shown. It also greatly simplifies the
wakelock logic and makes it completely deterministic instead of
relying on timed delays.
Bug:
17516245
Change-Id: If2b96845a010f2d05c610970257d898f32ccacb7
Jeff Brown [Thu, 18 Sep 2014 22:22:26 +0000 (15:22 -0700)]
Ensure that the screen on blocker is applied while dozing.
The screen on blocker is used to keep the screen blank while the
system is drawing new content to prevent the user from seeing a
flash of stale content while the screen is being turned on.
This patch ensures that the screen on blocker functionality
is also applied while dozing.
Bug:
17516245
Change-Id: I77c2d0f2b99476a59ad212099f44c63aa2ef9c34
Dianne Hackborn [Fri, 19 Sep 2014 19:58:15 +0000 (12:58 -0700)]
Add new activity dumpsys command to persist all data.
Very useful for testing persisting/restoring, to make sure
that all pending changes have been written.
Change-Id: I0e3b7cd3af8afb0b6e751e086081566ab00b76c9
George Mount [Fri, 19 Sep 2014 17:02:02 +0000 (10:02 -0700)]
Target only shared elements with shared element Transition
Bug
17549213
Bug
17553253
Change-Id: If54aebb4e37d2012aa8d1c5354d5ec03f92b81a3
Michael Wright [Fri, 19 Sep 2014 19:52:53 +0000 (19:52 +0000)]
Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev
Adam Powell [Fri, 19 Sep 2014 19:50:31 +0000 (12:50 -0700)]
Add colorEdgeEffect to themes, default it to colorPrimary
Allow edgeeffect colors to be changed independently of the primary
color for the current theme.
Bug
16512225
Change-Id: Ibc13ad755f489fe1f6d16af0c61a1d12dd1a61f7
Jason Monk [Fri, 19 Sep 2014 19:25:46 +0000 (19:25 +0000)]
Merge "Fix crash in PacManager" into lmp-dev
Alan Viverette [Fri, 19 Sep 2014 19:11:46 +0000 (19:11 +0000)]
Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev
Paul Soulos [Fri, 19 Sep 2014 18:00:52 +0000 (11:00 -0700)]
Fixes typo in Intent documentation
bug:
17583712
Change-Id: I37c77644213417751f8261098af44096aef51b14
Nancy Chen [Fri, 19 Sep 2014 19:08:28 +0000 (19:08 +0000)]
Merge "Add constructor for DisconnectCause that does not require a tone." into lmp-dev
Jason Monk [Fri, 19 Sep 2014 16:46:19 +0000 (12:46 -0400)]
Fix crash in PacManager
The PacManager would clear the pac url by setting it to null, however
everywhere else, pac url is cleared to Uri.EMPTY. This sometimes leads
to an NPE when PAC is set and cleared rapidly and take down the whole
framework.
Bug:
17581527
Change-Id: I84ce215f4f6a8a7e804372fc0a1e20ac609a21f1
Selim Cinek [Fri, 19 Sep 2014 15:20:05 +0000 (17:20 +0200)]
Optimized and improved the status bar performance a lot
Instead of clearing the Statusbarwindow buffer in the beginning
we now draw the scrim with mode SRC and therefore a whole screen
of overdraw is saved!
Bug:
17287256
Change-Id: I29f14a2c3d4cb087c422ae6f486d23d7f8ec173b
Adam Lesinski [Fri, 19 Sep 2014 18:19:56 +0000 (18:19 +0000)]
Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev
Jeff Sharkey [Fri, 19 Sep 2014 18:08:45 +0000 (11:08 -0700)]
Fix bugs when system apps reclaim permissions.
Recently we started letting system apps always take precedence over
third-party apps when defining permissions. This change fixes that
logic to claim the permission immediately, instead of delaying until
after the next reboot. (Permissions are always reevaluated after
each install.)
We also tighten the constraints slightly to prevent two system
apps from fighting over a permission definition; the first system
app to claim the permission wins.
Bug:
17526617
Change-Id: I49686407f5e99322bc511795c653c5d702becd9d
Nancy Chen [Fri, 19 Sep 2014 17:53:21 +0000 (10:53 -0700)]
Add constructor for DisconnectCause that does not require a tone.
In order to create a DisconnectCause with a label/description that does
not require specifying a tone.
Bug:
17486242
Change-Id: If82605ff20fc9f53ed41b49e12575424c6efc2b6
Chris Craik [Fri, 19 Sep 2014 17:42:21 +0000 (17:42 +0000)]
Merge "Hide other color filter mutability" into lmp-dev
Adam Powell [Fri, 19 Sep 2014 17:25:33 +0000 (17:25 +0000)]
Merge "Make panel menu windows respect elevation" into lmp-dev
Alan Viverette [Fri, 19 Sep 2014 17:23:34 +0000 (10:23 -0700)]
Fix action bar title size consistency
BUG:
17582193
Change-Id: I7dfe9229361dcd52893fd96e1e8f9a006d7ffad3
John Reck [Fri, 19 Sep 2014 17:22:16 +0000 (17:22 +0000)]
Merge "glFinish to flush deletes" into lmp-dev
Alan Viverette [Fri, 19 Sep 2014 17:20:45 +0000 (10:20 -0700)]
Fix radial time picker inner circle (1-12) selections
Result of a poorly collapsed set of if block conditionals.
BUG:
17580782
Change-Id: I7f7e5038f943d1f49e1541acfa282479cb2505ea
Jason Monk [Fri, 19 Sep 2014 17:19:39 +0000 (17:19 +0000)]
Merge "QS: Fix accessibility announce for dual tiles" into lmp-dev
Amit Mahajan [Fri, 19 Sep 2014 17:12:32 +0000 (17:12 +0000)]
Merge "Handling service number convert while roaming." into lmp-dev
John Reck [Fri, 19 Sep 2014 17:10:19 +0000 (10:10 -0700)]
glFinish to flush deletes
Bug:
17479800
Change-Id: I4d4a3eeda510e037f806052025184f3cde18c847
Christoph Studer [Fri, 19 Sep 2014 16:43:45 +0000 (16:43 +0000)]
Merge "Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()" into lmp-dev
Jeff Sharkey [Fri, 19 Sep 2014 16:32:51 +0000 (16:32 +0000)]
Merge "Only revoke ownerless grants when unprivileged." into lmp-dev
Alan Viverette [Fri, 19 Sep 2014 16:21:00 +0000 (16:21 +0000)]
Merge "Delete file containing removed attributes and styles" into lmp-dev
Jeff Sharkey [Fri, 19 Sep 2014 16:14:34 +0000 (09:14 -0700)]
Only revoke ownerless grants when unprivileged.
Recently we relaxed revokeUriPermission() to allow apps to revoke
Uri permissions that had been granted to them, but this uncovered
bugs in apps that had been relying on the previous no-op behavior.
To mitigate this, only revoke ownerless Uri permissions when in the
unprivileged state; an active owner indicates that another component
of the calling app still needs the permission.
Bug:
17554268
Change-Id: Icc412933b29041ffb699d20136a623440ecc71ec
John Spurlock [Fri, 19 Sep 2014 16:04:35 +0000 (16:04 +0000)]
Merge "When dozing, re-enable falsing threshold and log events." into lmp-dev
Chris Craik [Tue, 16 Sep 2014 17:51:45 +0000 (10:51 -0700)]
Hide other color filter mutability
bug:
17262092
Change-Id: Ia6c0e1a684365c372803d1a6be41a478a05e0dd0
Amith Yamasani [Fri, 19 Sep 2014 15:51:38 +0000 (15:51 +0000)]
Merge "Allow primary user profile owner to set device restrictions" into lmp-dev
John Spurlock [Fri, 19 Sep 2014 12:30:21 +0000 (08:30 -0400)]
When dozing, re-enable falsing threshold and log events.
- Reactivate our configured keyguard falsing swipe threshold
for secure keyguards, but only when dozing.
- Add DozeLog helper to capture/maintain interesting events
about the doze + unlock process, enabled by default, but
only on devices that start dozing at least once.
- Dump summary counts + logged events to dumpsys output.
- Pass notification pulse "instance" as an extra to the scheduled
intent, so we can log accordingly.
Bug:
17496795
Change-Id: I7e88f93bfc967bdc06550cf1fe5e74d535edd774
Baligh Uddin [Fri, 19 Sep 2014 15:42:00 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
George Mount [Fri, 19 Sep 2014 15:39:44 +0000 (15:39 +0000)]
Merge "Fix exception when fragment container has no View." into lmp-dev
George Mount [Fri, 19 Sep 2014 15:39:02 +0000 (15:39 +0000)]
Merge "Fix NPE when shared element listener is null." into lmp-dev
Chris Craik [Fri, 19 Sep 2014 15:31:17 +0000 (15:31 +0000)]
Merge "Fix garbage showing up beneath dialogs" into lmp-dev
Alan Viverette [Fri, 19 Sep 2014 15:21:51 +0000 (08:21 -0700)]
Delete file containing removed attributes and styles
These were already removed from public.xml, so this change does
not affect current.txt or public resource IDs.
BUG:
17577849
Change-Id: I3a754e968732705e5facfbc96e6e14c901d08596
Jessica Hummel [Fri, 19 Sep 2014 14:22:42 +0000 (14:22 +0000)]
Merge "bug fix: Allow enableSystemApps to be called by profile and device owner." into lmp-dev
Jason Monk [Thu, 18 Sep 2014 20:11:09 +0000 (16:11 -0400)]
QS: Fix accessibility announce for dual tiles
Bug:
17512411
Change-Id: I3515804fce2742e9553d65dab9693ccc0b9f39cf
Paul Jensen [Fri, 19 Sep 2014 11:59:48 +0000 (11:59 +0000)]
Merge "Fix to make repeated lingerings work." into lmp-dev
Jessica Hummel [Tue, 16 Sep 2014 10:56:50 +0000 (11:56 +0100)]
bug fix: Allow enableSystemApps to be called by profile and device owner.
We had an additional check for managed profile in there, so it wasn't working for device owners. Also needed to look at uninstalled packages.
Change-Id: I4813f23b00d7905e92ade582ce082a6f295a322d
Bug:
17384318
Kenny Guy [Fri, 19 Sep 2014 09:44:21 +0000 (09:44 +0000)]
Merge "Remove suggested key names as its confusing." into lmp-dev
Christoph Studer [Thu, 18 Sep 2014 18:35:36 +0000 (20:35 +0200)]
Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()
When services call Service.stopForeground(), remove
FLAG_FOREGROUND_SERVICE from the notification that was supplied
to Service.startForeground().
This enables services to post notifications that become user
dismissable when they switch to being a background service.
Restrict this to targetSdk=L apps to reduce the risk of breaking
existing apps.
Bug:
17551106
Change-Id: Iff8541e5bb2a23ad1fbc9ad80df5fd6eb683148b
Yohei Yukawa [Fri, 19 Sep 2014 05:19:03 +0000 (05:19 +0000)]
Merge "Speculative fix of IMMS crash" into lmp-dev
Yohei Yukawa [Fri, 19 Sep 2014 04:22:15 +0000 (13:22 +0900)]
Speculative fix of IMMS crash
This CL is a follow up CL for I6571d464a46453934f0a8f5e790.
Do not propagate Resources.NotFoundException to the caller
of InputMethodInfo.isDefault().
BUG:
17553712
BUG:
17549437
BUG:
17517332
Change-Id: Ie95880c1f68f49eb63518e69b7dfa20af3ce8737
Dan Sandler [Fri, 19 Sep 2014 03:32:30 +0000 (03:32 +0000)]
Merge "Fix LayoutInflater copy constructor logic." into lmp-dev
Dan Sandler [Fri, 19 Sep 2014 02:11:18 +0000 (22:11 -0400)]
Fix LayoutInflater copy constructor logic.
Avoids an NPE in mFilterMap.
Bug:
17548265
Change-Id: I6556373862f706dbcf5549eaec61c3e10a47b482
Dianne Hackborn [Fri, 19 Sep 2014 02:01:57 +0000 (02:01 +0000)]
Merge "Fix issue #
17564607: Apps in the managed profile can send any intent..." into lmp-dev
Dianne Hackborn [Fri, 19 Sep 2014 01:38:30 +0000 (18:38 -0700)]
Fix issue #
17564607: Apps in the managed profile can send any intent...
...to the primary user, even if it was not whitelisted to be forwarded.
The path where getActivityInfo is called for the ResolverActivity
would not correctly apply the requested user ID to the result, so
it wouldn't run under the correct user.
Change-Id: I1da47c54bbed26091832a28236d0b06762c92437
Mike Lockwood [Fri, 19 Sep 2014 02:00:25 +0000 (02:00 +0000)]
Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev
Michael Wright [Fri, 19 Sep 2014 01:29:49 +0000 (18:29 -0700)]
Respect intent-filter priority for system keyboard layouts.
Bug:
17573945
Change-Id: Id357e199b37ef771c4362c2a5c4ae762071f0042
w19976 [Sat, 13 Sep 2014 06:09:05 +0000 (23:09 -0700)]
Handling service number convert while roaming.
When roaming, change *611 to +
19085594899.
Bug:
17202092
Change-Id: Ibd130911131e9ed245cca7130853176f831e361e
Adam Powell [Fri, 19 Sep 2014 01:22:29 +0000 (18:22 -0700)]
Make panel menu windows respect elevation
Bug
17430536
Change-Id: I962dfa10d3cb4f735dcaa68f17e7ff278d1580a2
Alan Viverette [Fri, 19 Sep 2014 01:16:21 +0000 (01:16 +0000)]
Merge "Always apply window insets to action modes" into lmp-dev
Amit Mahajan [Fri, 19 Sep 2014 01:07:22 +0000 (01:07 +0000)]
Merge "Fix voice mail number to modify when insert H3G Denmark sim card." into lmp-dev
Yigit Boyar [Fri, 19 Sep 2014 00:59:52 +0000 (00:59 +0000)]
Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev
giseok.seo [Wed, 7 May 2014 03:04:49 +0000 (12:04 +0900)]
Fix voice mail number to modify when insert H3G Denmark sim card.
1.H3G Denmark SIM Card is set to "not available" in UST(Usim service Table) to
EF_MBDN file of SIM CARD.
so do not edit voicemail number.
2.AOSP default voicemail number is empty.
so if inserted H3G Denmark SIM card, User cann't edit voicemail number and
do not use voicemail service.
Bug:
14093735
Change-Id: I2469ef8e8bda376adcdc9549bf4227bc4c0ddb2e
Winson Chung [Thu, 18 Sep 2014 23:50:35 +0000 (23:50 +0000)]
Merge "Try and bind search widget before initial calculations of transition rects. (Bug
17456094)" into lmp-dev
Winson Chung [Thu, 18 Sep 2014 23:50:31 +0000 (23:50 +0000)]
Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug
17481968)" into lmp-dev
Yigit Boyar [Thu, 18 Sep 2014 23:01:28 +0000 (16:01 -0700)]
Fix scroll position calculation when clipToPadding is false
Bug:
17568582
Change-Id: I904450d62c93105db5c61a071c7816278bb441be
Craig Mautner [Thu, 18 Sep 2014 23:08:24 +0000 (23:08 +0000)]
Merge "Don't count finishing activities as effective activities." into lmp-dev
Chris Craik [Thu, 18 Sep 2014 23:05:35 +0000 (16:05 -0700)]
Fix garbage showing up beneath dialogs
bug:
17463894
Fixes the setViewport method to immediately affect the return values
of getViewportWidth/Height methods.
Also works around tiling extension issues observed on first frame
after window resize by disabling tiling for that frame.
Change-Id: Ie172d572d20d74a1be9cc58ad389af2cffa0e4b6
George Mount [Thu, 18 Sep 2014 22:51:22 +0000 (22:51 +0000)]
Merge "Fix broken logic in isValidTarget" into lmp-dev
Alan Viverette [Thu, 18 Sep 2014 22:46:42 +0000 (15:46 -0700)]
Always apply window insets to action modes
BUG:
17567245
Change-Id: I3c37d228e3a9d3060a4fd1a86abf2ffbf91802e8
Winson Chung [Thu, 18 Sep 2014 22:45:23 +0000 (22:45 +0000)]
Merge "Listening for widget changes while Recents is in the background. (Bug
17153663)" into lmp-dev
Craig Mautner [Thu, 18 Sep 2014 22:38:33 +0000 (15:38 -0700)]
Don't count finishing activities as effective activities.
They were being counted as effectiveRoot even though they were
finishing.
Fixes bug
17550936.
Change-Id: Iaf7201e6150095e55f88344e4b257e4ae8f19a2b
George Mount [Wed, 17 Sep 2014 23:59:36 +0000 (16:59 -0700)]
Fix NPE when shared element listener is null.
Bug
17544867
The shared element listener will be null after the transitions
have been canceled.
Change-Id: Id1182639b44ece27fc267702623641438f9974d5
Alan Viverette [Thu, 18 Sep 2014 22:26:02 +0000 (22:26 +0000)]
Merge "Fix the underlined spinner asset to match text field" into lmp-dev
George Mount [Wed, 17 Sep 2014 23:36:42 +0000 (16:36 -0700)]
Fix exception when fragment container has no View.
Bug
17535259
Change-Id: I29c9ef53dd693cbb4043ebfb4750753870c9e99a
Amith Yamasani [Thu, 18 Sep 2014 16:42:42 +0000 (09:42 -0700)]
Allow primary user profile owner to set device restrictions
In addition to device owners, profile owners on the primary user
can also set user restrictions that are necessary to lock down the
user.
This is to enable the case of a profile owner registered after setup
wizard is completed, on the primary user.
Also make managed profile vs. profile wording consistent in the
DevicePolicyManager docs.
Bug:
17555025
Change-Id: Ib9d08b8af34a99b25e11757fa7dc83673a7deb32
Adrian Roos [Thu, 18 Sep 2014 21:29:58 +0000 (21:29 +0000)]
Merge "Additional check to determine insets for recents animation" into lmp-dev