drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
221,479 Commits 1 Branch 0 Tags
Commit Graph

221479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
cfd3d76b91 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:39:20 +00:00
Baligh Uddin
c138df954f Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:39:16 +00:00
Baligh Uddin
aa4dbe2d84 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:39:12 +00:00
Alan Viverette
1259f616c2 Use ConstantState directly instead of ConstantStateFuture 
All of the functionality of ConstantStateFuture has been moved into
prepareDrawable. We don't need the extra wrapper class.

Change-Id: I452b13320a838a23c8ec0dd486a89bf383142d7b
 2015-11-05 14:34:44 -05:00
Dan Albert
22b7e496c2 Merge "Use std::unique_ptr instead of UniquePtr." 2015-11-05 19:32:43 +00:00
Baligh Uddin
70df552ac2 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:32:07 +00:00
Baligh Uddin
31f0d18a03 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:32:05 +00:00
Robert Carr
e6a8351bc7 Extract application window usage of SurfaceController. 
Abstract the usage of SurfaceController from wm w.r.t
application windows in to a new WindowSurfaceController
class. This class tracks boring book keeping, logging,
errors, etc...to lend clarity to difficult policy
code in WindowStateAnimator et al.

Change-Id: Ifcd5d48a51e68564f49e799ae793b320cac88645
 2015-11-05 11:20:15 -08:00
Adam Lesinski
f1c54e6e89 Merge "AAPT2: Fix small issue with detecting translatable resources" 2015-11-05 19:20:05 +00:00
Chad Brubaker
f386e9da36 Merge "Add initial network security config implementation" am: 8c35820720 am: 0bafbbfcb4 
am: b4b53b0741

* commit 'b4b53b0741b6ff75842d6630d5d1010c4efa766c':
  Add initial network security config implementation
 2015-11-05 19:05:47 +00:00
Chad Brubaker
b4b53b0741 Merge "Add initial network security config implementation" am: 8c35820720 
am: 0bafbbfcb4

* commit '0bafbbfcb4cbb6e6f20c0309f5c4242be83f18d7':
  Add initial network security config implementation
 2015-11-05 18:58:39 +00:00
Wale Ogunwale
6d42df6d17 Set correct focus activity when using FLAG_ACTIVITY_REORDER_TO_FRONT 
When FLAG_ACTIVITY_REORDER_TO_FRONT is used to launch an activity we
move the activity to the front of the task, but the ActivityRecord.frontOfTask
isn't set because the activity isn't in the resumed set yet.
This causes issues later on when we try to detemine the focus activity in
ActivityStack.adjustFocusedActivityLocked.
We now set ActivityRecord.frontOfTask for the activity we are moving
due to FLAG_ACTIVITY_REORDER_TO_FRONT

Bug: 25487874
Change-Id: I4a20e6fb11e04ae16361da27c59aec2641b82bfb
 2015-11-05 18:57:45 +00:00
Adam Lesinski
9f22204c3a AAPT2: Fix small issue with detecting translatable resources 
Change-Id: Idd21b5de4d20be06c6f8c8eb5a22ccd68afc4927
 2015-11-05 10:56:32 -08:00
Brian Carlstrom
ce8bf86d6d Merge "Fixes for sm and pm usage" am: ffb15da518 am: 671d5965f7 
am: f73e78fe1c

* commit 'f73e78fe1cb6803a29f7f85b49792f4e8a7350c8':
  Fixes for sm and pm usage
 2015-11-05 18:55:49 +00:00
Chad Brubaker
0bafbbfcb4 Merge "Add initial network security config implementation" 
am: 8c35820720

* commit '8c358207206c5e19541c65e3f9761d1adb54550b':
  Add initial network security config implementation
 2015-11-05 18:52:46 +00:00
Brian Carlstrom
f73e78fe1c Merge "Fixes for sm and pm usage" am: ffb15da518 
am: 671d5965f7

* commit '671d5965f7b15ecba10453e8f445418dc0e730e6':
  Fixes for sm and pm usage
 2015-11-05 18:48:22 +00:00
Chad Brubaker
8c35820720 Merge "Add initial network security config implementation" 2015-11-05 18:46:24 +00:00
Brian Carlstrom
671d5965f7 Merge "Fixes for sm and pm usage" 
am: ffb15da518

* commit 'ffb15da518e35727e218bfba48927902d4368e2f':
  Fixes for sm and pm usage
 2015-11-05 18:42:53 +00:00
Brian Carlstrom
ffb15da518 Merge "Fixes for sm and pm usage" 2015-11-05 18:38:56 +00:00
Dan Albert
a76bafdc44 Merge "Don\'t apply clang flag to gcc builds." am: d9a1b35df6 am: a41288b88f 
am: e0bcc4efe9

* commit 'e0bcc4efe96f196104e6de681b28de295d70fb84':
  Don't apply clang flag to gcc builds.
 2015-11-05 18:33:51 +00:00
Brian Carlstrom
82bfca4609 Fixes for sm and pm usage 
sm showed IllegalArgumentException after usage.
pm inconsistently used "return showUsage()"

Bug: 20948199
Change-Id: I5828489a9d4ef2eabfb97dd408d66e1560a5a983
 2015-11-05 10:33:40 -08:00
Jeff Sharkey
f131e1aae9 Kick movement preconditions onto handler thread. 
The bulk of package moving already occurs on the handler thread,
but one of the precondition steps requires that we make an installd
call to calculate disk space of the app.  If there was already
another long-running installd call going on, we could end up ANR'ing
the caller.

Since movePackage() is already designed to return a moveId and go
async, we can push all the precondition steps onto the handler thread
to prevent the ANR.

Bug: 25490003
Change-Id: I62d555c23bbf81b791f6f4cabc40c3d64c580cf8
 2015-11-05 10:28:43 -08:00
Dan Albert
e0bcc4efe9 Merge "Don\'t apply clang flag to gcc builds." am: d9a1b35df6 
am: a41288b88f

* commit 'a41288b88f18273a61ed0af977408761598216cf':
  Don't apply clang flag to gcc builds.
 2015-11-05 18:28:19 +00:00
John Reck
5e22ae6291 Merge "add DeviceInfo" 2015-11-05 18:24:14 +00:00
Dan Albert
a41288b88f Merge "Don\'t apply clang flag to gcc builds." 
am: d9a1b35df6

* commit 'd9a1b35df62eddc56f69281aea1534d187b63205':
  Don't apply clang flag to gcc builds.
 2015-11-05 18:22:57 +00:00
Dan Albert
d9a1b35df6 Merge "Don't apply clang flag to gcc builds." 2015-11-05 18:18:45 +00:00
Julia Reynolds
5e219cddc9 Merge "Fix radio button flash on hour change." 2015-11-05 18:13:24 +00:00
John Reck
704bed0da7 add DeviceInfo 
This reverts commit 096895550b9d5430d7a001d491566decf4f9791b.

Change-Id: Ib2ed1e96d8f7f88302f5e27fe735687194553104
 2015-11-05 10:13:23 -08:00
Chris Craik
e0fa7476a5 Revert "Remove -ffast-math from libhwui makefile" 
This reverts commit e02ec7c37a92fd63748a610bac6a23d0409788cf.

Change-Id: Iea7fadf04c4ffa62be28f783342ae749f89bf931
 2015-11-05 17:58:28 +00:00
Filip Gruszczynski
51cb83e1db Fix wallpaper flicker when docking a window from freeform. 
When we are replacing a window, let's keep the wallpaper visible until the
replacement finishes.

Change-Id: I32f3500151c048fa8c8c1daeba1c74fb3447ff8e
 2015-11-05 09:33:32 -08:00
Deepanshu Gupta
2b23bc32cc Merge "Fix Switch colors" into mnc-ub-dev am: 71093465ab 
am: ceb2b54909

* commit 'ceb2b549095b5f9a70baef6a0a847b453735f97a':
  Fix Switch colors
 2015-11-05 17:29:47 +00:00
Deepanshu Gupta
ceb2b54909 Merge "Fix Switch colors" into mnc-ub-dev 
am: 71093465ab

* commit '71093465abbdf887c705b40fb0cb8a2919894c4b':
  Fix Switch colors
 2015-11-05 17:24:38 +00:00
Deepanshu Gupta
71093465ab Merge "Fix Switch colors" into mnc-ub-dev 2015-11-05 17:21:16 +00:00
Deepanshu Gupta
c9b8f95c99 Fix Switch colors 
The conversion of the PorterDuff mode from int to enum was incorrect
resulting in the wrong PorterDuff Mode being used.

Change-Id: I7607d505b6e4382e6101869971154f6a77db279c
 2015-11-05 09:20:07 -08:00
Filip Gruszczynski
bad0ed16ec Merge "Animate the dock divider appearance/disappearance." 2015-11-05 17:00:18 +00:00
Filip Gruszczynski
57f76f1c54 Animate the dock divider appearance/disappearance. 
We want to animate the dock divider appearance only after the entrance
animation of the docked activity finishes, so these two don't clash. For
disappearance they will animate together.

Bug: 24913915
Change-Id: Ibe5c3960f21fcc5e64039b158605fa09017c5c34
 2015-11-05 08:59:36 -08:00
Filip Gruszczynski
4a16de0e32 Merge "Split code out from WMS.realyoutWindow." 2015-11-05 16:49:01 +00:00
Julia Reynolds
0ca82fecc2 Fix radio button flash on hour change. 
Also delete confusing debug variable.

Bug: 25459795
Change-Id: I9208ece4edf5fbcff5f257994f47d81a901766e8
 2015-11-05 11:08:02 -05:00
Svetoslav Ganov
3b2872a871 Merge "Take into account default app for default grants" am: 82eeb2f20c am: 0c7e9262a1 
am: f7db8e407b

* commit 'f7db8e407b02a3cb2fe1e1e5838b1ebcb67f6dc5':
  Take into account default app for default grants
 2015-11-05 15:50:28 +00:00
Svetoslav Ganov
4c515357e5 Merge "Enforce weaker grant if app is default handler for miltiple action" am: 035374d7a2 am: a9b62e1330 
am: 1809ccc62e

* commit '1809ccc62e6c3649b3024a099dccccb3b773cf49':
  Enforce weaker grant if app is default handler for miltiple action
 2015-11-05 15:48:34 +00:00
Jason Monk
51a942380b Updates to Drawer 
Support doing nothing on tvs and watches.  Also better not doing
anything with no categories existing.

Change-Id: I4a12d4d907a08e75ed3cdcd3f7c68a3a100c687d
 2015-11-05 08:52:41 -05:00
Dan Albert
0eadf57cad Don't apply clang flag to gcc builds. 
For whatever reason GCC doesn't fail the build on unknown flags unless
there is also a warning emitted. Since we're now deprecating
UniquePtr, the warning is thrown here and the build fails (despite not
being -Werror).

Bug: http://b/22403888
Change-Id: I4af7911a51f7af9aa47a596a76f3e9d79535585b
 2015-11-05 00:59:09 -08:00
Dan Albert
b0624da118 Use std::unique_ptr instead of UniquePtr. 
We're deprecating UniquePtr, so we need to move to the real thing.

Bug: http://b/22403888
Change-Id: I5b7fdf4924dd8c12a8c7dba89278714ca6fdc60a
 2015-11-05 00:57:12 -08:00
Terry Heo
a22d77e247 CEC: Check validity of tvinput id 
Bug: 25006096
Change-Id: I1eec8c5ec863b85d66d9c9722101af7f7d3d2f40
 2015-11-05 07:26:08 +00:00
Tomasz Mikolajewski
2273e0f095 Implement efficient move on Internal Storage. 
Bug:24884813
Change-Id: I5a8dfeb13313a3e60ba2993643eb547adca7b851
 2015-11-05 13:12:32 +09:00
Tomasz Mikolajewski
b29cb7c9ae Merge "Remove TRANSFER_MODE_NONE from CopyManager." 2015-11-05 04:02:36 +00:00
Chong Zhang
1b2c41cd6c Merge "fix missing dim layer surface" 2015-11-05 03:55:51 +00:00
Chong Zhang
9263a045ba fix missing dim layer surface 
bug: 24913379
Change-Id: Id3280ba9cccea57ca9cf0274cea589cd58e71a56
 2015-11-04 18:39:08 -08:00
Tomasz Mikolajewski
261b6bdd36 Remove TRANSFER_MODE_NONE from CopyManager. 
This field is not necessary, as an operation is always either copy or move.

Change-Id: Ide68bb2bf5d237ed4c9abe8c443edd8e12dd82dd
 2015-11-05 11:31:32 +09:00
Svetoslav Ganov
f7db8e407b Merge "Take into account default app for default grants" am: 82eeb2f20c 
am: 0c7e9262a1

* commit '0c7e9262a1cc89b748e281f330dd1ffecec6df3f':
  Take into account default app for default grants
 2015-11-05 02:30:08 +00:00