OSDN Git Service

android-x86/frameworks-base.git
8 years agoAllow QS tiles to open dialogs
Jason Monk [Wed, 18 Nov 2015 21:35:14 +0000 (16:35 -0500)]
Allow QS tiles to open dialogs

Add a TYPE_QS_DIALOG window type, that is in the same layer as
apps and dialogs and such.  It is guarded by having a token
that is granted by SysUI after a click has occured.  If the
app shows a dialog before listening finishes (QS closes) then
the token will stay granted until the tile is removed by the
user, otherwise the token will be removed immediately to avoid
later dialogs.

Also fix a couple tiny TileService issues:
 - Stop/Start listening reversed
 - Fix javadoc referencing wrong action

Change-Id: Iedcdd5fd9a2af2b33eb7f6f17bb0e6c997879876

8 years agoMerge "Merge new implementation of BitmapRegionDecoder."
Matt Sarett [Thu, 3 Dec 2015 13:38:03 +0000 (13:38 +0000)]
Merge "Merge new implementation of BitmapRegionDecoder."

8 years agoMerge "Create work challenge timeout"
Clara Bayarri [Thu, 3 Dec 2015 12:04:24 +0000 (12:04 +0000)]
Merge "Create work challenge timeout"

8 years agoCreate work challenge timeout
Clara Bayarri [Thu, 29 Oct 2015 15:43:55 +0000 (15:43 +0000)]
Create work challenge timeout

The work challenge should be locked whenever the device goes to sleep + admin
timeout or when the power button is pressed if the lock setting is on.

This change creates the infrastructure to lock a specific user instead of the
device and uses it in these cases. Then, the current code that brings up the
work challenge can check to only show it if the user is locked.

Change-Id: I89b4342b1458d97734d7afa66be52bf04ec3a3d4

8 years agoMerge "Fix @code escapes"
Neil Fuller [Thu, 3 Dec 2015 09:44:01 +0000 (09:44 +0000)]
Merge "Fix @code escapes"

8 years agoMerge "Fixing crash when trying to reset focused task after removing task."
Winson Chung [Thu, 3 Dec 2015 02:59:50 +0000 (02:59 +0000)]
Merge "Fixing crash when trying to reset focused task after removing task."

8 years agoFixing crash when trying to reset focused task after removing task.
Winson [Wed, 2 Dec 2015 23:10:14 +0000 (15:10 -0800)]
Fixing crash when trying to reset focused task after removing task.

- Moving the focused state back into the stack, since the task view
  is transient and can be rebound.  Also ensuring that we update the
  task view focus state as we return and pick up views from the view
  pool
- Fixing issue where going back from recents would not go back home
- Properly calculating the task visibility (regression)

Bug: 25975225

Change-Id: Ica861f0d8996e4e254e875199a2d704a65bf8e58

8 years agoMerge "Updating the freeform workspace layout"
Winson Chung [Thu, 3 Dec 2015 02:22:15 +0000 (02:22 +0000)]
Merge "Updating the freeform workspace layout"

8 years agoMerge "Adding notion of stack state to the layout."
Winson Chung [Thu, 3 Dec 2015 02:21:44 +0000 (02:21 +0000)]
Merge "Adding notion of stack state to the layout."

8 years agoMerge "Make sure tap detector is valid before trying to initialize."
Wale Ogunwale [Thu, 3 Dec 2015 02:18:44 +0000 (02:18 +0000)]
Merge "Make sure tap detector is valid before trying to initialize."

8 years agoMerge "Revert "allow locking UI mode and block launching car dock for automotive""
Keun-young Park [Thu, 3 Dec 2015 02:11:20 +0000 (02:11 +0000)]
Merge "Revert "allow locking UI mode and block launching car dock for automotive""

8 years agoRevert "allow locking UI mode and block launching car dock for automotive"
Keun-young Park [Thu, 3 Dec 2015 02:11:00 +0000 (02:11 +0000)]
Revert "allow locking UI mode and block launching car dock for automotive"

This reverts commit 1746369a6bcd1a7219e94366b3774bfdfff08fc6.

Change-Id: I4989e99b8f648145d0dbfe18e557102939e7d1e3

8 years agoMake sure tap detector is valid before trying to initialize.
Wale Ogunwale [Thu, 3 Dec 2015 01:46:17 +0000 (17:46 -0800)]
Make sure tap detector is valid before trying to initialize.

Bug: 25879224
Change-Id: Iefebeec9a0c75fe25d4e2476b797a003670b047a

8 years agoMerge "allow locking UI mode and block launching car dock for automotive"
Keun-young Park [Thu, 3 Dec 2015 01:45:12 +0000 (01:45 +0000)]
Merge "allow locking UI mode and block launching car dock for automotive"

8 years agoMerge "Don\'t hardcode expected path to mainDexClasses" am: be1613379e am: 38400b4696
Colin Cross [Thu, 3 Dec 2015 01:35:41 +0000 (01:35 +0000)]
Merge "Don\'t hardcode expected path to mainDexClasses" am: be1613379e am: 38400b4696
am: 6b644ec528

* commit '6b644ec528f62b74850e8566132a790e8f9f00da':
  Don't hardcode expected path to mainDexClasses

8 years agoMerge "Don\'t hardcode expected path to mainDexClasses" am: be1613379e
Colin Cross [Thu, 3 Dec 2015 01:28:09 +0000 (01:28 +0000)]
Merge "Don\'t hardcode expected path to mainDexClasses" am: be1613379e
am: 38400b4696

* commit '38400b4696111d88b4fadb1fe99bdd05e40ba6be':
  Don't hardcode expected path to mainDexClasses

8 years agoMerge "Don\'t hardcode expected path to mainDexClasses"
Colin Cross [Thu, 3 Dec 2015 01:19:28 +0000 (01:19 +0000)]
Merge "Don\'t hardcode expected path to mainDexClasses"
am: be1613379e

* commit 'be1613379e4814e9c54901d6e0171841e68f60ab':
  Don't hardcode expected path to mainDexClasses

8 years agoMerge "Don't hardcode expected path to mainDexClasses"
Colin Cross [Thu, 3 Dec 2015 01:12:05 +0000 (01:12 +0000)]
Merge "Don't hardcode expected path to mainDexClasses"

8 years agoMerge "Allow current user in settings command"
Fyodor Kupolov [Thu, 3 Dec 2015 00:57:51 +0000 (00:57 +0000)]
Merge "Allow current user in settings command"

8 years agoUpdating the freeform workspace layout
Winson [Wed, 2 Dec 2015 00:02:12 +0000 (16:02 -0800)]
Updating the freeform workspace layout

- Updating layout for freeform workspaces
- Consolidates the clipping and bitmap scale with the transform to make
  the transitions more unified
- Updating clipping as we synchronize scroll instead of afterwards

Change-Id: I33de4e2646c75f0bc0eb75bd6909fe94557196b5

8 years agoAdding notion of stack state to the layout.
Winson [Tue, 1 Dec 2015 19:04:45 +0000 (11:04 -0800)]
Adding notion of stack state to the layout.

- This allows us to choose which layout to show, either freeform, stack,
  or a combination of the two
- Fixing crash with null bitmap

Change-Id: I659e66d89f7205ccb0c2ba22c57aee95c8d4b3ab

8 years agoAllow current user in settings command
Fyodor Kupolov [Tue, 1 Dec 2015 23:19:40 +0000 (15:19 -0800)]
Allow current user in settings command

settings command now accepts current user as an argument.

Bug: 25950700
Change-Id: Ia0cee8e956efe7bc341d87e5a7c7ec57678313bc

8 years agoDon't hardcode expected path to mainDexClasses
Colin Cross [Thu, 3 Dec 2015 00:24:08 +0000 (16:24 -0800)]
Don't hardcode expected path to mainDexClasses

Use MAINDEXCLASSES defined by the build system instead of manually using
$(HOST_OUT_EXECUTABLES)/mainDexClasses.

Change-Id: Iede13c243ef0c4e374c8e80bab4a995cea76b9b1

8 years agoMerge "Adds a notification action to cancel a bugreport in progress."
Felipe Leme [Thu, 3 Dec 2015 00:18:34 +0000 (00:18 +0000)]
Merge "Adds a notification action to cancel a bugreport in progress."

8 years agoMerge "Unset is -1 not Nan"
Philip P. Moltmann [Thu, 3 Dec 2015 00:01:42 +0000 (00:01 +0000)]
Merge "Unset is -1 not Nan"

8 years agoMerge "Nuke HardwareRenderer abstract base"
John Reck [Wed, 2 Dec 2015 23:54:01 +0000 (23:54 +0000)]
Merge "Nuke HardwareRenderer abstract base"

8 years agoNuke HardwareRenderer abstract base
John Reck [Wed, 2 Dec 2015 23:08:07 +0000 (15:08 -0800)]
Nuke HardwareRenderer abstract base

Bug: 17303292

Change-Id: I4a272ea4f695f4f9993e8be640fdd8530b691be0

8 years agoAdds a notification action to cancel a bugreport in progress.
Felipe Leme [Mon, 30 Nov 2015 17:35:59 +0000 (09:35 -0800)]
Adds a notification action to cancel a bugreport in progress.

BUG: 25794470
Change-Id: I6f9c58fa7257f0826ab77007562cbff7db3e4cf0

8 years agoUnset is -1 not Nan
Philip P. Moltmann [Wed, 2 Dec 2015 23:39:09 +0000 (15:39 -0800)]
Unset is -1 not Nan

Change-Id: I6e7fac4b9f1c3dc6cc88c786db856ddecf3f8538

8 years agoMerge "Promoting a function from Gsm/Cdma CellLocation classes to parent class"
Amit Mahajan [Wed, 2 Dec 2015 23:32:16 +0000 (23:32 +0000)]
Merge "Promoting a function from Gsm/Cdma CellLocation classes to parent class"

8 years agoMerge "Add ListView rendering benchmark"
Chris Craik [Wed, 2 Dec 2015 23:21:21 +0000 (23:21 +0000)]
Merge "Add ListView rendering benchmark"

8 years agoAdd ListView rendering benchmark
Chris Craik [Wed, 25 Nov 2015 22:14:53 +0000 (14:14 -0800)]
Add ListView rendering benchmark

Also fixes a bug in DrawRenderNodeOp recording, which was triggered by
the new test.

Change-Id: I328f2ed908495eb95ca8ce87a365d02650e72cd5

8 years agoMerge "Add DownloadsActivity functional test."
Steve McKay [Wed, 2 Dec 2015 23:06:35 +0000 (23:06 +0000)]
Merge "Add DownloadsActivity functional test."

8 years agoMerge "Make drag handle tests stable."
Keisuke Kuroyanagi [Wed, 2 Dec 2015 23:04:22 +0000 (23:04 +0000)]
Merge "Make drag handle tests stable."

8 years agoMake drag handle tests stable.
Keisuke Kuroyanagi [Wed, 2 Dec 2015 23:02:05 +0000 (15:02 -0800)]
Make drag handle tests stable.

The center position of a drag handle can be outside of the
screen. In such cases, selection handle tests can be failed.
Changed to drag the visible position to deal with it.

Bug: 25730231
Change-Id: Id9270fc03d0f39041f243c9e9d17deca19925e09

8 years agoDO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property....
Chris Elliott [Wed, 2 Dec 2015 22:54:29 +0000 (22:54 +0000)]
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." am: 8e79dae3f6 am: 087d30c142
am: a6ed5dcd04  -s ours

* commit 'a6ed5dcd044fdeec84b42472cb393ddf9315a0ae':
  DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."

8 years agoMerge "Fix SplitTests CTS test"
Todd Kennedy [Wed, 2 Dec 2015 22:51:58 +0000 (22:51 +0000)]
Merge "Fix SplitTests CTS test"

8 years agoDO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property....
Chris Elliott [Wed, 2 Dec 2015 22:46:11 +0000 (22:46 +0000)]
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." am: 8e79dae3f6
am: 087d30c142

* commit '087d30c14243f38c28793877b8e5ad12d3a2b269':
  DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."

8 years agoAdd DownloadsActivity functional test.
Steve McKay [Wed, 2 Dec 2015 19:20:54 +0000 (11:20 -0800)]
Add DownloadsActivity functional test.

Bug: 25809806
Change-Id: I43ceaf3a99715a57e3d349bee60f2edf7f6666bd

8 years agoDO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
Chris Elliott [Wed, 2 Dec 2015 21:57:06 +0000 (21:57 +0000)]
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
am: 8e79dae3f6

* commit '8e79dae3f67aae032010ddbbef2f8032ace01263':
  DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."

8 years agoFix SplitTests CTS test
Todd Kennedy [Wed, 2 Dec 2015 21:40:49 +0000 (13:40 -0800)]
Fix SplitTests CTS test

A recent change tightened the check for whether or not an APK has code.
The check verified against the application and not the individual split.

Bug: 25769800
Change-Id: Ia53bd0e31ce3379bdd8bfe6d0c3da99b6d65fe31

8 years agoMerge "Make Hyphenator load Spanish hyphenation patterns"
Roozbeh Pournader [Wed, 2 Dec 2015 21:19:48 +0000 (21:19 +0000)]
Merge "Make Hyphenator load Spanish hyphenation patterns"

8 years agoDO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
Chris Elliott [Wed, 2 Dec 2015 21:16:46 +0000 (13:16 -0800)]
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."

This reverts commit f60491183def4c46b4026afb4648544e7289ea5f.

8 years agoMerge "Speed up setting launch"
Jason Monk [Wed, 2 Dec 2015 21:10:45 +0000 (21:10 +0000)]
Merge "Speed up setting launch"

8 years agoMerge "Add permission to prevent third-parth apps from querying OOM scores"
Chong Zhang [Wed, 2 Dec 2015 21:02:37 +0000 (21:02 +0000)]
Merge "Add permission to prevent third-parth apps from querying OOM scores"

8 years agoSpeed up setting launch
Jason Monk [Wed, 2 Dec 2015 20:39:19 +0000 (15:39 -0500)]
Speed up setting launch

Try to avoid too many calls to the PM and cache the info we get
from it to avoid too much stuff during settings launch.

Change-Id: I64132cbe47cf8eac6080c8c82583b0b5eeb75a28

8 years agoMerge "Add extras to ClipDescription"
Vladislav Kaznacheev [Wed, 2 Dec 2015 20:52:04 +0000 (20:52 +0000)]
Merge "Add extras to ClipDescription"

8 years agoMerge "Cleanup zen rule instances."
Julia Reynolds [Wed, 2 Dec 2015 20:27:12 +0000 (20:27 +0000)]
Merge "Cleanup zen rule instances."

8 years agoMake Hyphenator load Spanish hyphenation patterns
Roozbeh Pournader [Wed, 2 Dec 2015 20:24:31 +0000 (12:24 -0800)]
Make Hyphenator load Spanish hyphenation patterns

The pattern files themselves are added to the
external/hyphenation-patterns repo.

Change-Id: Icf37191f1217b7869f49f8ea63174341662caacf

8 years agoCleanup zen rule instances.
Julia Reynolds [Mon, 30 Nov 2015 21:43:05 +0000 (16:43 -0500)]
Cleanup zen rule instances.

1. When a user revokes zen access
2. When a user clears data

Bug: 25472361
Change-Id: Ia439a7c2bd6dc07a60a374caf4157508131e3578

8 years agoAdd permission to prevent third-parth apps from querying OOM scores
Chong Zhang [Wed, 2 Dec 2015 20:18:52 +0000 (12:18 -0800)]
Add permission to prevent third-parth apps from querying OOM scores

bug: 25853091
Change-Id: Ic1cdbf155e1e930405773fd078dfc57fda2d9afa

8 years agoMerge "Adding context flag to open database with no localized collators"
Sunny Goyal [Wed, 2 Dec 2015 20:17:29 +0000 (20:17 +0000)]
Merge "Adding context flag to open database with no localized collators"

8 years agoMerge "API to determine user locked/unlocked state."
Jeff Sharkey [Wed, 2 Dec 2015 20:16:37 +0000 (20:16 +0000)]
Merge "API to determine user locked/unlocked state."

8 years agoAPI to determine user locked/unlocked state.
Jeff Sharkey [Wed, 2 Dec 2015 20:04:49 +0000 (13:04 -0700)]
API to determine user locked/unlocked state.

Bug: 25946804
Change-Id: I2b8c8c75fda161a446d79fac811fdd446aa3a4db

8 years agoMerge "Fix reporting of uid state in battery stats."
Dianne Hackborn [Wed, 2 Dec 2015 20:05:57 +0000 (20:05 +0000)]
Merge "Fix reporting of uid state in battery stats."

8 years agoMerge "Ensure we update window scale when repositioning child."
Rob Carr [Wed, 2 Dec 2015 19:45:22 +0000 (19:45 +0000)]
Merge "Ensure we update window scale when repositioning child."

8 years agoMerge "Relax null parameter enforcement for legacy apps"
Chris Tate [Wed, 2 Dec 2015 19:38:44 +0000 (19:38 +0000)]
Merge "Relax null parameter enforcement for legacy apps"

8 years agoMerge "Don't deselect files after copy."
Steve McKay [Wed, 2 Dec 2015 19:24:58 +0000 (19:24 +0000)]
Merge "Don't deselect files after copy."

8 years agoRelax null parameter enforcement for legacy apps
Christopher Tate [Wed, 2 Dec 2015 18:54:56 +0000 (10:54 -0800)]
Relax null parameter enforcement for legacy apps

No longer throws when calling cancel() with a null PendingIntent if
the app targets SDK < NYC.

Bug 25798631

Change-Id: Ic91f42808811645b01802abcc785f4218aac0e8b

8 years agoMerge "Create Vpn ManageDialog in onCreate, not onResume"
Robin Lee [Wed, 2 Dec 2015 19:14:46 +0000 (19:14 +0000)]
Merge "Create Vpn ManageDialog in onCreate, not onResume"

8 years agoAdding context flag to open database with no localized collators
Sunny Goyal [Wed, 2 Dec 2015 17:51:02 +0000 (09:51 -0800)]
Adding context flag to open database with no localized collators

Bug: 25956606
Change-Id: I209a8d18a7e83c1af54309fae8607f8b46772196

8 years agoMerge "Prevent windows in pinned stack from gaining window focus."
Wale Ogunwale [Wed, 2 Dec 2015 19:11:03 +0000 (19:11 +0000)]
Merge "Prevent windows in pinned stack from gaining window focus."

8 years agoAdd extras to ClipDescription
Vladislav Kaznacheev [Tue, 24 Nov 2015 19:24:12 +0000 (11:24 -0800)]
Add extras to ClipDescription

This is required to expand metadata capabilities of DragEvent.
Apps receiving ACTION_DRAG_* events have access to
ClipDescription, but not ClipData.

Adding extras to ClipDescription allows for a richer behavior of apps
responding to these events.

Bug: 25788641
Change-Id: I07e374f71d16f8441dc3a0b02c7d833e0139b74b

8 years agoMerge changes I2af07b57,Ic0a774e8,Ica3d21ff,Id4c3c901
Selim Cinek [Wed, 2 Dec 2015 19:08:58 +0000 (19:08 +0000)]
Merge changes I2af07b57,Ic0a774e8,Ica3d21ff,Id4c3c901

* changes:
  FalsingManager Quick settings fix
  Fixed a bug where the panel could be too small in certain cases
  Fixed a bug where the margins where not updated correctly
  Fixed the handling of the expand on the lockscreen

8 years agoPrevent windows in pinned stack from gaining window focus.
Wale Ogunwale [Wed, 2 Dec 2015 17:14:28 +0000 (09:14 -0800)]
Prevent windows in pinned stack from gaining window focus.

Windows in the pinned stack shouldn't receive input keys, so we prevent
they from gaining window focus so the focus/input keys goes to the stack
below the pinned stack.

Also, cleaned up some code.

Bug: 25580816
Change-Id: Iea1f944d167310233c3dbaea140a4ada568bb815

8 years agoMerge "Added DISALLOW_RUN_IN_BACKGROUND user restriction"
Fyodor Kupolov [Wed, 2 Dec 2015 18:27:26 +0000 (18:27 +0000)]
Merge "Added DISALLOW_RUN_IN_BACKGROUND user restriction"

8 years agoMerge "SoundPool: add lock for findSample access from SoundPoolThread"
Andy Hung [Wed, 2 Dec 2015 18:27:08 +0000 (18:27 +0000)]
Merge "SoundPool: add lock for findSample access from SoundPoolThread"

8 years agoMerge "Show share button in downloads."
Steve McKay [Wed, 2 Dec 2015 18:27:03 +0000 (18:27 +0000)]
Merge "Show share button in downloads."

8 years agoDon't deselect files after copy.
Steve McKay [Wed, 2 Dec 2015 01:02:42 +0000 (17:02 -0800)]
Don't deselect files after copy.

Bug: 5419032
Change-Id: Ib00e232c81b6400583cb4091882e5874decd0be2

8 years agoAdded DISALLOW_RUN_IN_BACKGROUND user restriction
Fyodor Kupolov [Wed, 7 Oct 2015 22:52:33 +0000 (15:52 -0700)]
Added DISALLOW_RUN_IN_BACKGROUND user restriction

It forces the user to stop instead of going into the background. Also
changed behavior of stopUser method. Now it also attempts to stop related
users along with the specified userId.

Based on ag/807976, with the only difference that it's now a user restriction.

Bug: 24579258
Bug: 24708668
Change-Id: I357298908816fc58feeed83b7e9979fc33d25da6

8 years agoMerge "Refactoring: SelectionHandleView."
Keisuke Kuroyanagi [Wed, 2 Dec 2015 18:18:58 +0000 (18:18 +0000)]
Merge "Refactoring: SelectionHandleView."

8 years agoMerge "Add bounds information to stack/task WM dump"
Wale Ogunwale [Wed, 2 Dec 2015 18:13:37 +0000 (18:13 +0000)]
Merge "Add bounds information to stack/task WM dump"

8 years agoMerge "Copy into ASEC container"
Todd Kennedy [Wed, 2 Dec 2015 17:34:50 +0000 (17:34 +0000)]
Merge "Copy into ASEC container"

8 years agoMerge "Audio focus: uid/pid log info on focus request/abandon"
Jean-Michel Trivi [Wed, 2 Dec 2015 17:31:05 +0000 (17:31 +0000)]
Merge "Audio focus: uid/pid log info on focus request/abandon"

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 2 Dec 2015 16:52:42 +0000 (16:52 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 2 Dec 2015 16:48:39 +0000 (17:48 +0100)]
Import translations. DO NOT MERGE

Change-Id: I58bd0cba05ce41485fb9733e922ed9daa5ec6363
Auto-generated-cl: translation import

8 years agoMerge "Fix animating quick settings tiles"
Jason Monk [Wed, 2 Dec 2015 16:43:06 +0000 (16:43 +0000)]
Merge "Fix animating quick settings tiles"

8 years agoMerge "Allow print service to specify progress of print and status"
Philip P. Moltmann [Wed, 2 Dec 2015 16:34:58 +0000 (16:34 +0000)]
Merge "Allow print service to specify progress of print and status"

8 years agoFix animating quick settings tiles
Jason Monk [Wed, 2 Dec 2015 16:30:36 +0000 (11:30 -0500)]
Fix animating quick settings tiles

Bug: 25835488
Change-Id: Id9757dd2ae05c73a8b06d3bf9e8b3a2cb8296437

8 years agoCreate Vpn ManageDialog in onCreate, not onResume
Robin Lee [Wed, 2 Dec 2015 16:17:58 +0000 (16:17 +0000)]
Create Vpn ManageDialog in onCreate, not onResume

Bug: 25786112
Change-Id: I3dc2ccdce4cc9b449968ab59d1e1d0ff0476ecec

8 years agoMerge "Fix getKeySetByAlias PackageMgr test."
Daniel Cashman [Wed, 2 Dec 2015 15:35:28 +0000 (15:35 +0000)]
Merge "Fix getKeySetByAlias PackageMgr test."

8 years agoFix getKeySetByAlias PackageMgr test.
dcashman [Wed, 2 Dec 2015 01:04:58 +0000 (17:04 -0800)]
Fix getKeySetByAlias PackageMgr test.

commit 42aed1b8ecf591009f9e2df8eaca4f41074c37c8 changed the hidden
KeySet API to allow packages to retrieve keysets of other packages.
Change the PackageManagerTests to not expect a SecurityExeption
anymore and also make sure that this is supported.

Bug: 25935839
Change-Id: I18c00997a627c9df1eb3826650c1aa71f563a2bd

8 years agoMerge "Fix tests"
Todd Kennedy [Wed, 2 Dec 2015 15:25:31 +0000 (15:25 +0000)]
Merge "Fix tests"

8 years agoFix @code escapes
Neil Fuller [Mon, 30 Nov 2015 09:51:33 +0000 (09:51 +0000)]
Fix @code escapes

The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.

Bug: 25757239
Change-Id: Ib38a0fa2dd2a3d68e467f78a812071e763d7e881

8 years agoMerge "Resolve merge conflicts of 5ec51457e1 to master."
Robin Lee [Wed, 2 Dec 2015 13:57:04 +0000 (13:57 +0000)]
Merge "Resolve merge conflicts of 5ec51457e1 to "

8 years agoResolve merge conflicts of 5ec51457e1 to master.
Robin Lee [Wed, 2 Dec 2015 13:48:32 +0000 (13:48 +0000)]
Resolve merge conflicts of 5ec51457e1 to master.

Change-Id: I70c12ad663c3b4d3b5e3b8f40bc659cb94d82c14

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 2 Dec 2015 13:37:33 +0000 (05:37 -0800)]
Import translations. DO NOT MERGE

Change-Id: Icead64fbc942b39b292289d3054845eefe3170b8
Auto-generated-cl: translation import

8 years agoMerge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED" am: 3fe5a65b1c
Robin Lee [Wed, 2 Dec 2015 12:47:59 +0000 (12:47 +0000)]
Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED" am: 3fe5a65b1c
am: 427edbce96

* commit '427edbce965f62707a2a43d86d70d9d19f6c60dc':
  DevicePolicy: Always send ACTION_PASSWORD_CHANGED

8 years agoMerge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED"
Robin Lee [Wed, 2 Dec 2015 12:41:20 +0000 (12:41 +0000)]
Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED"
am: 3fe5a65b1c

* commit '3fe5a65b1cc621d40f6278dd1e38d5ec58f92fb6':
  DevicePolicy: Always send ACTION_PASSWORD_CHANGED

8 years agoMerge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED"
Robin Lee [Wed, 2 Dec 2015 12:35:14 +0000 (12:35 +0000)]
Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED"

8 years agoMerge "FloatingToolbar polish."
Abodunrinwa Toki [Wed, 2 Dec 2015 12:01:45 +0000 (12:01 +0000)]
Merge "FloatingToolbar polish."

8 years agoRemove merge markers from preloaded-classes
Przemyslaw Szczepaniak [Wed, 2 Dec 2015 11:32:22 +0000 (11:32 +0000)]
Remove merge markers from preloaded-classes

Change-Id: I8267fc4cd41868f406e32a64ee750c0e5ca6098d

8 years agoFloatingToolbar polish.
Abodunrinwa Toki [Fri, 30 Oct 2015 16:41:45 +0000 (16:41 +0000)]
FloatingToolbar polish.

This patch updates the FloatingToolbar to look and transition
exactly as described in the UX spec.

It includes an animating (VectorDrawable) overflow button and
menu item buttons that sit in place during transitions.

Bug: 24257588
Change-Id: I2b3f84ba451800830878667ce1abd7a99b4f9fea

8 years agoMerge "More inline reply goodness"
Adrian Roos [Wed, 2 Dec 2015 07:09:12 +0000 (07:09 +0000)]
Merge "More inline reply goodness"

8 years agoMerge changes I9bf21cc6,Iee45a465
Deepanshu Gupta [Wed, 2 Dec 2015 06:08:06 +0000 (06:08 +0000)]
Merge changes I9bf21cc6,Iee45a465

* changes:
  Revert "Revert "Add support for Choreographer animations""
  Add ability to promote fields.

8 years agoMerge "Fixed typos: when when"
Sungsoo Lim [Wed, 2 Dec 2015 06:01:26 +0000 (06:01 +0000)]
Merge "Fixed typos: when when"

8 years agoRevert "Revert "Add support for Choreographer animations""
Deepanshu Gupta [Wed, 2 Dec 2015 05:55:58 +0000 (21:55 -0800)]
Revert "Revert "Add support for Choreographer animations""

This reverts commit 8390b2ac85765e768d4b685077a96e6395d208b4.

The build break should now be fixed by
cbb1ba7f493116882b79578ec68646366f29cde4

Change-Id: I9bf21cc6dbdb5d515a665384dc6dfa464c3e6e2e

8 years agoFixed typos: when when
Sungsoo Lim [Wed, 2 Dec 2015 05:47:59 +0000 (14:47 +0900)]
Fixed typos: when when

Change-Id: I80c0b8817dcbed45071e42d9ffa88bae52a93a81

8 years agoAdd ability to promote fields.
Deepanshu Gupta [Wed, 2 Dec 2015 05:44:56 +0000 (21:44 -0800)]
Add ability to promote fields.

This adds the ability to promote private fields to public ones to
enable layoutlib to access them. This was first added in change
b556decf75b2b084e1aed54ac7fa23a141eedb7f, but reverted in
847b0d3ad22a47e0bca3d8bc8168fea7a0ba2f80. This is essentially a revert
of the change again, but without the SimpleMonthView related stuff.

Also, promote the Choreographer's field as is needed to support
animations.

Change-Id: Iee45a465c7a1cadd362c1841385941e6232e4900

8 years agoAdd optional permission review for legacy apps - framework
Svet Ganov [Wed, 2 Dec 2015 03:52:26 +0000 (19:52 -0800)]
Add optional permission review for legacy apps - framework

For some markets we have to allow the user to review permissions
for legacy apps at runtime despite them not supporting the new
permission model. This is achieved by showing a review UI before
launching any app component. If an update is installed the user
should see a permission review UI for the newly requested
permissions.

To allow distinguishing which permissions need a review we set
a special flag in the permission flags that a review is required.
This flag is set if a runtime permission is granted to a legacy
app and the system does not launch any app components until this
flag is cleared. Since install permissions are shared across all
users the dangerous permissions for legacy apps in review mode
are represented as always granted runtime permissions since the
reivew requirement is on a per user basis.

Whether the build supports permission review for legacy apps is
determined by a build constant allowing us to compile away the
unnecessary code for markets that do not require a permissions
review.

If an app launches an activity in another app that has some
permissions needing review, we launch the permissions review
UI and pass it a pending intent to launch the activity after
the review is completed.

If an app sends a broadcast to another app that has some permissions
needing review, we do not deliver the broadcast and if the sending
app is in the foreground plus the broadcast is explicit (has a
component) we launch the review UI giving it a pending intent to
send the broadcast after the review is completed.

If an app starts a service in another app that has some permissions
needing review, we do not start the service and if the calling app
is in the foreground we launch the review UI and pass it a pending
intent to start the service after the review is completed.

If an app binds to a service in another app that has some permissions
needing review, we schedule the binding but do not spin the target
service's process and we launch the review UI and pass it a callback
to invoke after the review is completed which spins the service
process and completes the binding.

If an app requests a content provider in another app that has some
permissions needing review we do not return the provider and if
the calling app is in the foreground we show the review UI.

Change-Id: I550f5ff6cadc46a98a1d1a7b8415eca551203acf