196345 Commits

Author SHA1 Message Date
Geoff Mendal
e9eef64495 Import translations. DO NOT MERGE
Change-Id: I53dabfe326ba0f15b66ecac3829e6b8f55b33924
Auto-generated-cl: translation import
2015-07-01 08:50:39 -05:00
Chris Banes
2bc8485ba7 Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev 2015-07-01 07:58:05 +00:00
Miao Wang
8a752abe77 Merge "[RenderScript] update the type of offsets for BLAS.BNNM" into mnc-dev 2015-07-01 05:12:07 +00:00
Ronghua Wu
e0b71b4ef7 Merge "media: clean up the usage of max-supported-instances." into mnc-dev 2015-07-01 04:00:23 +00:00
Svet Ganov
22233b51c3 Merge "Remove the empty accounts group and not needed storage resources." into mnc-dev 2015-07-01 02:32:50 +00:00
Christopher Tate
2438c9b2e7 Merge "Fix dispatch of onRestoreFinished()" into mnc-dev 2015-07-01 01:25:54 +00:00
Christopher Tate
758de809b9 Fix dispatch of onRestoreFinished()
The agent instance wasn't properly being conveyed from the generic
restore engine implementation to the state machine handling the
lifecycles.  On top of that, the lifecycle wasn't advancing to the
restore-finished callback phase properly in the full-data restore
case.

Bug 22194736

Change-Id: Ic649d6a196adbd21a4a0f3083c7eed2fff383e52
2015-06-30 17:58:27 -07:00
Svet Ganov
67a461eca8 Merge "Rename uses-permission-m to uses-permission-23" into mnc-dev 2015-07-01 00:55:58 +00:00
Yohei Yukawa
63c4a7185c Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-dev 2015-07-01 00:51:36 +00:00
Jeff Sharkey
fc2740ae57 Merge "Hand out storage to more system apps." into mnc-dev 2015-07-01 00:42:44 +00:00
Dianne Hackborn
80abf887a1 Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 2015-07-01 00:41:46 +00:00
Adam Lesinski
14b5701029 Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev 2015-07-01 00:40:25 +00:00
Jeff Sharkey
7186dd3a30 Hand out storage to more system apps.
Grant storage access to the Storage Access Framework provider that
offers to delegate access to storage devices.  Also grant to the
default music app.

Bug: 22104872
Change-Id: I8cf7dceec8b4c1e31f8ddd40b094ccd4ecb1caf8
2015-06-30 17:32:48 -07:00
Jeff Sharkey
ca2f2feda8 Merge "Fully unmount existing storage in Zygote." into mnc-dev 2015-06-30 23:59:50 +00:00
Dianne Hackborn
593334ab70 Fix issue #22124996: VI: Command Request not Active
Just forgot to add the request to the active set.

Also eradicate a bunch of old cruft that has been replaced
by the final APIs, and improve voice interaction test to
sit fully on top of the final APIs and have a test for
command request.

Change-Id: Ieff7a6165ebf2a4c5fb80c1ebd020511a2ae63ee
2015-06-30 16:59:41 -07:00
Jorim Jaggi
e4b840d63d Fix overexpand panel motion
Expanding was already set to false when we decided which QS
overscroll animation to run. We can't change the order of expanding
finished/tracking finished because of another bug. Instead, let the
stack scroller know about tracking state and combine both of them.

Bug: 21705230
Change-Id: I041ff1fabc6c939c233528f9d08d804ead64bbab
2015-06-30 23:33:00 +00:00
Jorim Jaggi
e4f1a202d8 Fix Keyguard header animation from SHADE_LOCKED -> Keyguard
Bug: 22128249
Change-Id: I36dbecc41e66922987c1b753d62bde27cb3b17be
2015-06-30 23:25:33 +00:00
Yohei Yukawa
d1a092218b Reland "Fixed constant window switching on lock screen..."
This is a manual reland of I3680256d41793f62def42fda00e26db1dcc9,
which was certainly merged into lmp-mr1-dev then auto-merged into
master but silently lost there for unknown reasons when
I8c42a1e6091b0fe1253e90265ac248087e was auto-merged into master.

Changes in WindowAnimator.java was already covered by
I2933eaf0ab55fe31cb382c46c411033e33a756e0 so this CL does not
include that change.

Bug: 18021493
Bug: 22158649
Change-Id: Ib1bf9f5bef44d0400230afc32231f7d1f3a1c98b
2015-06-30 16:22:05 -07:00
ztenghui
c2756505b2 Merge "Update the doc for VectorDrawable's Tint support" into mnc-dev 2015-06-30 23:20:31 +00:00
Adam Lesinski
49a2a6985d Merge "Add helper function to extract app ID from shared app gid." into mnc-dev 2015-06-30 23:16:20 +00:00
Svet Ganov
ffd25bbed1 Rename uses-permission-m to uses-permission-23
bug:20072113

Change-Id: Ia872853274c604a6fee1c1d84f82a98334523bac
2015-06-30 23:06:41 +00:00
Amith Yamasani
2b64ec470c Merge "Don't allow non-admins to adopt sd card for internal storage" into mnc-dev 2015-06-30 23:00:08 +00:00
ztenghui
810c1c868e Update the doc for VectorDrawable's Tint support
b/21726146

Change-Id: I262f77b980afa81407b008276190062974cdc4fa
2015-06-30 15:59:21 -07:00
Jeff Sharkey
faf3f69217 Fully unmount existing storage in Zygote.
Before mounting the requested storage into place, fully unmount all
existing mounts inherited from the root namespace.

Bug: 22192518
Change-Id: I6f7f12c1219d25ee487a031d37c60fb4051d24ad
2015-06-30 15:56:33 -07:00
Chet Haase
081ddbe296 Merge "Invalidate parent when scrolling child view back onto screen" into mnc-dev 2015-06-30 22:46:44 +00:00
Alan Viverette
5906f58771 Merge "Use non-greedy view to draw background in landscape time picker" into mnc-dev 2015-06-30 22:45:07 +00:00
Deepanshu Gupta
c428b55c97 Merge "Replace infinite loop with foreach." into mnc-dev 2015-06-30 22:42:00 +00:00
Deepanshu Gupta
f5ca45baab Merge "Add missing resolveResValue call." into mnc-dev 2015-06-30 22:41:44 +00:00
Deepanshu Gupta
c77f9c76e4 Replace infinite loop with foreach.
A method call exists to find all inner classes. Use it instead of
manually enumerating the possibilities and checking.

Also fix a typo.

Change-Id: I2af678e92ea0c11b53617b247d8cda324391c185
2015-06-30 15:36:34 -07:00
Chet Haase
1b7f8f99c3 Invalidate parent when scrolling child view back onto screen
This bug caused views which used to be quick-rejected to continue to not
be drawn because the parent's DisplayList no longer contained them. The
fix is to notice when offsetting a view puts it back on screen and invalidates
the parent appropriately.

Issue #21413554  offsetTopAndBottom requires invalidating parent when view becomes visible again

Change-Id: I0f5d2cc48e3da912a41635712d9c37fb30e70c86
2015-06-30 15:33:30 -07:00
Jorim Jaggi
6ef5898793 Don't show orb when voice session is already running
Bug: 22195186
Change-Id: I7839536d2f6362889a924b65011d80556f0176b8
2015-06-30 22:30:34 +00:00
Jorim Jaggi
3b866bee86 Make sure endClosing doesn't get called too early
Bug: 22196478
Bug: 22184101
Change-Id: I3488c40b74a080efbba9b1544f9709f7e509988b
2015-06-30 22:30:08 +00:00
Alan Viverette
aa69922ace Use non-greedy view to draw background in landscape time picker
Bug: 21933765
Change-Id: I95d608e9be166308e3a9b013a2c4c17cd4345046
2015-06-30 15:29:13 -07:00
Adam Lesinski
f4216d30cd Add helper function to extract app ID from shared app gid.
Bug:22008744
Change-Id: Ifadc7df3777dd74932833f4d22a0e285d7bdaf95
2015-06-30 15:00:22 -07:00
Svet Ganov
1aaad610df Merge "Do not hold a lock when calling API to grant default permissions" into mnc-dev 2015-06-30 21:44:34 +00:00
Doris Liu
e08f3b3ff5 Merge "Resolve CompoundButton's foreground drawable for layout direction change" into mnc-dev 2015-06-30 21:42:43 +00:00
Doris Liu
99aa13ec10 Merge "Allow null child view when checking whether divider should draw" into mnc-dev 2015-06-30 21:35:09 +00:00
Deepanshu Gupta
5d1eaf4a19 Add missing resolveResValue call.
Bug: http://b.android.com/178504
Change-Id: I7dde8094cf762893e4f7ea0d3de87a281c9602cd
2015-06-30 14:28:58 -07:00
Chris Craik
ca985b54c8 Merge "Don't display layout bounds of GONE views" into mnc-dev 2015-06-30 21:22:26 +00:00
Amith Yamasani
462ac3a2aa Don't allow non-admins to adopt sd card for internal storage
Bug: 21883016
Change-Id: I9af3eeffd860b076e69bb02a3dc06edba5f95898
2015-06-30 14:21:01 -07:00
Doris Liu
f102d4266b Allow null child view when checking whether divider should draw
The beginning divider should draw before the first child that is not
set to GONE. Incidentally, there needs to be a check for such a child,
which involves checking the visibility of all the children with lower
indices. This CL takes into account the scenarios where children with
lower indices could be null, in which case we'll treat them as if they
were GONE.

Bug: 22199594
Change-Id: Iefc73ef87beec219898c967b9a3ccebd1e3b5b4c
2015-06-30 13:57:28 -07:00
Alan Viverette
b35e866713 Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev 2015-06-30 20:53:31 +00:00
Chris Craik
a763bb83cf Merge "Saturate alpha values when overlaying glyphs" into mnc-dev 2015-06-30 20:52:26 +00:00
Chris Craik
a1dab8bb0f Don't display layout bounds of GONE views
bug:22126532

Change-Id: Ib7816346e0f6ff54fcf7b180bf4042ce113728b9
2015-06-30 13:51:26 -07:00
Alex Klyubin
89575b678c Merge "Enforce IND-CPA requirement when generating asymmetric keys." into mnc-dev 2015-06-30 20:48:19 +00:00
Alan Viverette
6ef129e09d Handle null argument in ImageView.setImageIcon()
Provides consistency with setImageDrawable(). Also updates docs and
annotations for setImageZzz() methods that can take null.

Bug: 21664964
Change-Id: Ia9b7f8ee9edb23eeea457520bea4dd261decc794
2015-06-30 13:32:27 -07:00
Adam Lesinski
40fab055bb Merge "Add round/notround qualifier to docs" into mnc-dev 2015-06-30 20:31:26 +00:00
Adam Lesinski
32ddd53466 Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev 2015-06-30 20:30:46 +00:00
Chris Craik
de25a672b1 Saturate alpha values when overlaying glyphs
bug:19062769

Glyphs were stored to the output buffer with the assumption of
non-overlap, which is incorrect for certain fonts/strings. Instead,
blend src into dst, so new glyphs don't clobber existing content.

Change-Id: I6e22037500e67d5348ee2a43d939416c23c4d1ea
2015-06-30 13:24:18 -07:00
Bryce Lee
5cd293b379 Merge "Merge commit '91d2cbf4' into manualmerge" into mnc-dev 2015-06-30 20:15:42 +00:00