OSDN Git Service

android-x86/frameworks-base.git
8 years agoTest more DPM APIs.
Makoto Onuki [Tue, 22 Sep 2015 22:03:44 +0000 (15:03 -0700)]
Test more DPM APIs.

Bug 24061108

Change-Id: Ia9da19f62c0f4edf53ca1f4c213f0368ec1983ba

8 years agoCleanup USER_OWNER in activity and location services
Xiaohui Chen [Tue, 22 Sep 2015 22:29:31 +0000 (15:29 -0700)]
Cleanup USER_OWNER in activity and location services

Bug: 19913735
Change-Id: Ie2b7acb3fa53b1dcf7319de1eb5bdec585dbf78c

8 years agoCleanup OWNER references.
Xiaohui Chen [Tue, 22 Sep 2015 22:33:31 +0000 (15:33 -0700)]
Cleanup OWNER references.

Bug: 19913735
Change-Id: I2150c6baaab80fe11312e4401394a2a8da52e595

8 years agoCleanup USER_OWNER in DPMS
Xiaohui Chen [Tue, 22 Sep 2015 22:08:57 +0000 (15:08 -0700)]
Cleanup USER_OWNER in DPMS

This cl assumes device owner will continue running under user 0.

Bug: 19913735
Change-Id: I65c97f6f14fb362acbdcb6588b73787291100698

8 years agoMerge "Remove lookup3 gamma code"
Chris Craik [Wed, 23 Sep 2015 17:59:44 +0000 (17:59 +0000)]
Merge "Remove lookup3 gamma code"

8 years agoMerge "Add attribute for specifying initial ScaleDrawable level"
Alan Viverette [Wed, 23 Sep 2015 17:39:08 +0000 (17:39 +0000)]
Merge "Add attribute for specifying initial ScaleDrawable level"

8 years agoDon't split the href across lines
Evan Charlton [Wed, 23 Sep 2015 16:37:11 +0000 (09:37 -0700)]
Don't split the href across lines

This introduces untrimmed whitespace into the URL which causes an
infinite redirect loop when trying to load
/Geofence.Builder.%20%20%20%20.html

Bug: 20851763
Change-Id: I3dc670dc30e57f76403d1eeaf3a4ce50406b9d91

8 years agoMerge "Eliminate bad type parameterization."
Steve McKay [Wed, 23 Sep 2015 15:53:52 +0000 (15:53 +0000)]
Merge "Eliminate bad type parameterization."

8 years agoEliminate bad type parameterization.
Steve McKay [Tue, 22 Sep 2015 23:37:03 +0000 (16:37 -0700)]
Eliminate bad type parameterization.

Change-Id: Id886098926f3c62583f34cfbcc04953bb2f4e8c3

8 years agoMerge "Preserve windows during stack resize."
Filip Gruszczynski [Wed, 23 Sep 2015 15:32:29 +0000 (15:32 +0000)]
Merge "Preserve windows during stack resize."

8 years agoMerge "Always show full strength for wifi quick toggle"
Jason Monk [Wed, 23 Sep 2015 15:21:32 +0000 (15:21 +0000)]
Merge "Always show full strength for wifi quick toggle"

8 years agoAlways show full strength for wifi quick toggle
Jason Monk [Wed, 23 Sep 2015 15:11:00 +0000 (11:11 -0400)]
Always show full strength for wifi quick toggle

Don't show status like connection strength and activity for the
wifi quick toggle.

Change-Id: Ifb104627c516d054862b432b6c6d6d4e114b4ade

8 years agoAdd attribute for specifying initial ScaleDrawable level
Alan Viverette [Wed, 23 Sep 2015 14:20:59 +0000 (10:20 -0400)]
Add attribute for specifying initial ScaleDrawable level

Bug: 19182305
Change-Id: Ic1f183db6183017352babc6dc190fdb9124c285a

8 years agoMerge "Smooth progress bar animations"
Alan Viverette [Wed, 23 Sep 2015 14:07:11 +0000 (14:07 +0000)]
Merge "Smooth progress bar animations"

8 years agoSmooth progress bar animations
Alan Viverette [Wed, 23 Sep 2015 14:01:45 +0000 (10:01 -0400)]
Smooth progress bar animations

Removes smooth progress bar hack from volume dialog.

Bug: 23566299
Change-Id: Iafa32538b4f92705c4c1ca2a02145c078add2532

8 years agoMerge "Revert "Add more methods that take a userId to PackageManager.""
Nicolas Prévot [Wed, 23 Sep 2015 11:35:50 +0000 (11:35 +0000)]
Merge "Revert "Add more methods that take a userId to PackageManager.""

8 years agoRevert "Add more methods that take a userId to PackageManager."
Nicolas Prévot [Wed, 23 Sep 2015 11:34:38 +0000 (11:34 +0000)]
Revert "Add more methods that take a userId to PackageManager."

This reverts commit 3b0fc3cf24e1fecdbc11808483c2109415ebfdd2.

It breaks the build. I had missed other places that extend PackageManager.

Change-Id: Iff012ed4ec8d2d32821586eca85fce55ae67f5b5

8 years agoMerge "Add more methods that take a userId to PackageManager."
Nicolas Prévot [Wed, 23 Sep 2015 09:49:29 +0000 (09:49 +0000)]
Merge "Add more methods that take a userId to PackageManager."

8 years agoam b869cbe7: am e2153b97: am 184440ce: am 47cae240: Merge "Extended the maximum pulsi...
Justin Harrison [Wed, 23 Sep 2015 06:32:55 +0000 (06:32 +0000)]
am b869cbe7: am e2153b97: am 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev

* commit 'b869cbe75a00eac69e31434813d3d33dc16988e9':
  Extended the maximum pulsing duration when dozing

8 years agoam e2153b97: am 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration...
Justin Harrison [Wed, 23 Sep 2015 06:25:34 +0000 (06:25 +0000)]
am e2153b97: am 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev

* commit 'e2153b9741c7d9c3910c9355ae3bf6ec4f5c231b':
  Extended the maximum pulsing duration when dozing

8 years agoam 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration when dozing...
Justin Harrison [Wed, 23 Sep 2015 06:18:04 +0000 (06:18 +0000)]
am 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev

* commit '184440cea399d2332b5dc138a9e8a47e9cde3398':
  Extended the maximum pulsing duration when dozing

8 years agoam 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev
Justin Harrison [Wed, 23 Sep 2015 06:07:47 +0000 (06:07 +0000)]
am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev

* commit '47cae24077015c5226f5b2d00ebe841ccbaed2d6':
  Extended the maximum pulsing duration when dozing

8 years agoMerge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev
Justin Harrison [Wed, 23 Sep 2015 06:00:24 +0000 (06:00 +0000)]
Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev

8 years agoam 80743d2b: am 0f3d0612: am 0d93002a: am 17a76443: Merge "Dismiss color fade when...
Michael Lentine [Wed, 23 Sep 2015 05:48:04 +0000 (05:48 +0000)]
am 80743d2b: am 0f3d0612: am 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev

* commit '80743d2ba46f862d8ad910aed54452fae3759fc8':
  Dismiss color fade when it is no longer used.

8 years agoam 0f3d0612: am 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer...
Michael Lentine [Wed, 23 Sep 2015 05:41:35 +0000 (05:41 +0000)]
am 0f3d0612: am 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev

* commit '0f3d0612b649731a084a791a6cc6fa1b74fcd1a1':
  Dismiss color fade when it is no longer used.

8 years agoam 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer used." into...
Michael Lentine [Wed, 23 Sep 2015 05:33:05 +0000 (05:33 +0000)]
am 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev

* commit '0d93002af027044070a554d553ab524564404b18':
  Dismiss color fade when it is no longer used.

8 years agoam 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev
Michael Lentine [Wed, 23 Sep 2015 05:25:58 +0000 (05:25 +0000)]
am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev

* commit '17a764431a71ff91cbd9272d592fdcd15a9c7539':
  Dismiss color fade when it is no longer used.

8 years agoMerge "Dismiss color fade when it is no longer used." into mnc-dr-dev
Michael Lentine [Wed, 23 Sep 2015 05:19:19 +0000 (05:19 +0000)]
Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev

8 years agoam cc456c7f: am 7b9bcf02: am fd5cb76e: am 79490dba: Merge "Fix reintroduction of...
Soonil Nagarkar [Wed, 23 Sep 2015 02:21:59 +0000 (02:21 +0000)]
am cc456c7f: am 7b9bcf02: am fd5cb76e: am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev

* commit 'cc456c7fda260808c138caf4015697d42f497d2c':
  Fix reintroduction of b/10845061

8 years agoam 7e94ae83: am 1bdfd128: am 6da88610: am 302475e9: Fix verifyUnlock
Jorim Jaggi [Wed, 23 Sep 2015 02:21:52 +0000 (02:21 +0000)]
am 7e94ae83: am 1bdfd128: am 6da88610: am 302475e9: Fix verifyUnlock

* commit '7e94ae833f34917cc2a034a5f5be31a8cecb2553':
  Fix verifyUnlock

8 years agoam a098d0f4: am 249d2388: am 7ef6b8d7: am 1b68e8b7: Log time difference between power...
Jorim Jaggi [Wed, 23 Sep 2015 02:21:44 +0000 (02:21 +0000)]
am a098d0f4: am 249d2388: am 7ef6b8d7: am 1b68e8b7: Log time difference between power button presses for gesture

* commit 'a098d0f41c44c688a4540af01cd4817e47a1f324':
  Log time difference between power button presses for gesture

8 years agoam 7b9bcf02: am fd5cb76e: am 79490dba: Merge "Fix reintroduction of b/10845061" into...
Soonil Nagarkar [Wed, 23 Sep 2015 02:11:55 +0000 (02:11 +0000)]
am 7b9bcf02: am fd5cb76e: am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev

* commit '7b9bcf02e1954b48a80a9e43df5b25d875172730':
  Fix reintroduction of b/10845061

8 years agoam 1bdfd128: am 6da88610: am 302475e9: Fix verifyUnlock
Jorim Jaggi [Wed, 23 Sep 2015 02:11:49 +0000 (02:11 +0000)]
am 1bdfd128: am 6da88610: am 302475e9: Fix verifyUnlock

* commit '1bdfd1284151ba0b4afae11f70ee90208f0a1633':
  Fix verifyUnlock

8 years agoam 249d2388: am 7ef6b8d7: am 1b68e8b7: Log time difference between power button press...
Jorim Jaggi [Wed, 23 Sep 2015 02:11:44 +0000 (02:11 +0000)]
am 249d2388: am 7ef6b8d7: am 1b68e8b7: Log time difference between power button presses for gesture

* commit '249d2388d601f59c1aa45c30c023794d5af0c2e0':
  Log time difference between power button presses for gesture

8 years agoam fd5cb76e: am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev
Soonil Nagarkar [Wed, 23 Sep 2015 02:06:09 +0000 (02:06 +0000)]
am fd5cb76e: am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev

* commit 'fd5cb76ed654998df466147c19ec985115749e70':
  Fix reintroduction of b/10845061

8 years agoam 6da88610: am 302475e9: Fix verifyUnlock
Jorim Jaggi [Wed, 23 Sep 2015 02:06:03 +0000 (02:06 +0000)]
am 6da88610: am 302475e9: Fix verifyUnlock

* commit '6da88610cea1e5f815e2d56979f54808c02a652f':
  Fix verifyUnlock

8 years agoam 7ef6b8d7: am 1b68e8b7: Log time difference between power button presses for gesture
Jorim Jaggi [Wed, 23 Sep 2015 02:05:56 +0000 (02:05 +0000)]
am 7ef6b8d7: am 1b68e8b7: Log time difference between power button presses for gesture

* commit '7ef6b8d7449c1cf629e227a948f72bf73fcddb57':
  Log time difference between power button presses for gesture

8 years agoam 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev
Soonil Nagarkar [Wed, 23 Sep 2015 01:58:11 +0000 (01:58 +0000)]
am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev

* commit '79490dbacd90a851ed8d03d64acedbf3616adba4':
  Fix reintroduction of b/10845061

8 years agoam 302475e9: Fix verifyUnlock
Jorim Jaggi [Wed, 23 Sep 2015 01:58:01 +0000 (01:58 +0000)]
am 302475e9: Fix verifyUnlock

* commit '302475e93ce00287770aba9668acbe86e8b20a05':
  Fix verifyUnlock

8 years agoam 1b68e8b7: Log time difference between power button presses for gesture
Jorim Jaggi [Wed, 23 Sep 2015 01:57:55 +0000 (01:57 +0000)]
am 1b68e8b7: Log time difference between power button presses for gesture

* commit '1b68e8b711281a65c73006f10fdc2fdf2379ad60':
  Log time difference between power button presses for gesture

8 years agoMerge "Fix reintroduction of b/10845061" into mnc-dr-dev
Soonil Nagarkar [Wed, 23 Sep 2015 01:34:53 +0000 (01:34 +0000)]
Merge "Fix reintroduction of b/10845061" into mnc-dr-dev

8 years agoFix verifyUnlock
Jorim Jaggi [Tue, 22 Sep 2015 19:44:47 +0000 (12:44 -0700)]
Fix verifyUnlock

Bug: 23970549
Change-Id: I899d8a92050c257217fa8528c33cb4592ad6d76a

8 years agoMerge "Remove unused local variable."
Chih-hung Hsieh [Wed, 23 Sep 2015 00:05:16 +0000 (00:05 +0000)]
Merge "Remove unused local variable."

8 years agoLog time difference between power button presses for gesture
Jorim Jaggi [Tue, 22 Sep 2015 21:44:14 +0000 (14:44 -0700)]
Log time difference between power button presses for gesture

Bug: 24304031
Change-Id: Iab755268ee6d5c0c00836a6f68e65a74286074cf

8 years agoRemove unused local variable.
Chih-Hung Hsieh [Tue, 22 Sep 2015 23:32:39 +0000 (16:32 -0700)]
Remove unused local variable.

Found by clang/llvm for bullhead device.

Change-Id: I9225bd47f2b246bcc2cadf88da5974624831d9b8

8 years agoMerge "Fixed issue with stack size when rotating screen."
Wale Ogunwale [Tue, 22 Sep 2015 23:29:03 +0000 (23:29 +0000)]
Merge "Fixed issue with stack size when rotating screen."

8 years agoFixed issue with stack size when rotating screen.
Wale Ogunwale [Tue, 22 Sep 2015 02:01:47 +0000 (19:01 -0700)]
Fixed issue with stack size when rotating screen.

Stack bounds needs to be adjusted when the screen is rotated
so it occupies the same bounds on screen.

Change-Id: Id00031f2e1275f2d095f6e6b2e76b5b5d5c13864

8 years agoMerge "Properly size tasks based on stack size."
Wale Ogunwale [Tue, 22 Sep 2015 23:24:04 +0000 (23:24 +0000)]
Merge "Properly size tasks based on stack size."

8 years agoProperly size tasks based on stack size.
Wale Ogunwale [Tue, 22 Sep 2015 01:37:15 +0000 (18:37 -0700)]
Properly size tasks based on stack size.

There were a few places we weren’t doing this correctly

* When a new task is created the bounds should be the stack bounds
if the task is resizeable and not in freeform mode.
* When resizing a stack each task in the stack should be resized
base on if it is resizable vs. using the top running activity in
the stack to determine if all the tasks should be resized.

Change-Id: If3448c5629313e7e7fb91ffe8506014f16ad72db

8 years agoMerge "Update RecentsCreateView to use RecyclerView."
Steve McKay [Tue, 22 Sep 2015 23:13:11 +0000 (23:13 +0000)]
Merge "Update RecentsCreateView to use RecyclerView."

8 years agoUpdate RecentsCreateView to use RecyclerView.
Steve McKay [Tue, 22 Sep 2015 22:09:21 +0000 (15:09 -0700)]
Update RecentsCreateView to use RecyclerView.

Move common DirectoryContainerView handling to BaseActivity.

Change-Id: I2c34b23b7050b68999f16e6d7f651c94ea8e47b6

8 years agoRemoving RecentsCallbacks.
Winson [Tue, 22 Sep 2015 21:22:58 +0000 (14:22 -0700)]
Removing RecentsCallbacks.

- We can just refer to the PhoneStatusBar directly
  for callbacks similar to the screen pinning request.

8 years agoMerge "Allow SystemUI components to be started for non-system users."
Winson Chung [Tue, 22 Sep 2015 22:56:05 +0000 (22:56 +0000)]
Merge "Allow SystemUI components to be started for non-system users."

8 years agoPreserve windows during stack resize.
Filip Gruszczynski [Tue, 22 Sep 2015 20:13:24 +0000 (13:13 -0700)]
Preserve windows during stack resize.

It also adds debugging information for configuration changes, so it's
easier to observe what exactly changes.

Change-Id: Ia2cd4df9a868a8cea216ce137d67a1bb8ed2e6c7

8 years agoam 08dcdb1a: am d70a7737: am 6e7cbb7c: Merge "Add logs for the ungaze gesture." into...
Mojtaba Seyedhosseini [Tue, 22 Sep 2015 22:16:14 +0000 (22:16 +0000)]
am 08dcdb1a: am d70a7737: am 6e7cbb7c: Merge "Add logs for the ungaze gesture." into cw-e-dev

* commit '08dcdb1a5beac29643dca2a03c2e308760de636d':
  Add logs for the ungaze gesture.

8 years agoMerge "MidiService: update listener with current status when registered"
Phil Burk [Tue, 22 Sep 2015 22:15:14 +0000 (22:15 +0000)]
Merge "MidiService: update listener with current status when registered"

8 years agoMerge "BluetoothMidiDevice: change write type to support JamStik"
Phil Burk [Tue, 22 Sep 2015 22:11:53 +0000 (22:11 +0000)]
Merge "BluetoothMidiDevice: change write type to support JamStik"

8 years agoam d70a7737: am 6e7cbb7c: Merge "Add logs for the ungaze gesture." into cw-e-dev
Mojtaba Seyedhosseini [Tue, 22 Sep 2015 22:08:13 +0000 (22:08 +0000)]
am d70a7737: am 6e7cbb7c: Merge "Add logs for the ungaze gesture." into cw-e-dev

* commit 'd70a773793bf9fce06ba8888908601b94090236d':
  Add logs for the ungaze gesture.

8 years agoam 6e7cbb7c: Merge "Add logs for the ungaze gesture." into cw-e-dev
Mojtaba Seyedhosseini [Tue, 22 Sep 2015 21:51:07 +0000 (21:51 +0000)]
am 6e7cbb7c: Merge "Add logs for the ungaze gesture." into cw-e-dev

* commit '6e7cbb7c73b501eac6704ab407ec60f4d839bb6b':
  Add logs for the ungaze gesture.

8 years agoMerge "Add logs for the ungaze gesture." into cw-e-dev
Mojtaba Seyedhosseini [Tue, 22 Sep 2015 21:41:48 +0000 (21:41 +0000)]
Merge "Add logs for the ungaze gesture." into cw-e-dev

8 years agoRemove lookup3 gamma code
Chris Craik [Tue, 22 Sep 2015 21:22:29 +0000 (14:22 -0700)]
Remove lookup3 gamma code

Also clean up gamma / glyph cache properties

Change-Id: I75b1ac0cb55638bf787ffd3cf457483ae314f03b

8 years agoam 64c71b72: am 0d78b164: am 2c08546a: am d2b597d1: Merge "Enforce a timeout for...
Baligh Uddin [Tue, 22 Sep 2015 21:25:24 +0000 (21:25 +0000)]
am 64c71b72: am 0d78b164: am 2c08546a: am d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev

* commit '64c71b72ad0e56d64e72af4147231b7fe8f796ee':
  Enforce a timeout for Content Providers to be published.

8 years agoAdd logs for the ungaze gesture.
Mojtaba [Fri, 18 Sep 2015 23:35:24 +0000 (16:35 -0700)]
Add logs for the ungaze gesture.

-We add logs to track how much screen time we save with the ungaze feature.

Change-Id: I02bce959ce7ed5bc6c848e51256063c946ff3e87

8 years agoMerge "Make DPM/DPMS unit-testable"
Makoto Onuki [Tue, 22 Sep 2015 21:17:23 +0000 (21:17 +0000)]
Merge "Make DPM/DPMS unit-testable"

8 years agoAllow SystemUI components to be started for non-system users.
Winson [Tue, 22 Sep 2015 21:04:46 +0000 (14:04 -0700)]
Allow SystemUI components to be started for non-system users.

- Certain SystemUI components require initialization per-user, so this
  CL allows us to selectively start those components when SystemUI is
  restarted for each user, and also lets us remove some extra workaround
  code in Recents to handle this case.

8 years agoam 0d78b164: am 2c08546a: am d2b597d1: Merge "Enforce a timeout for Content Providers...
Baligh Uddin [Tue, 22 Sep 2015 21:11:30 +0000 (21:11 +0000)]
am 0d78b164: am 2c08546a: am d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev

* commit '0d78b1644a7ca20ccec1201bc748d01be6a7ebd1':
  Enforce a timeout for Content Providers to be published.

8 years agoam 2c08546a: am d2b597d1: Merge "Enforce a timeout for Content Providers to be publis...
Baligh Uddin [Tue, 22 Sep 2015 21:02:25 +0000 (21:02 +0000)]
am 2c08546a: am d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev

* commit '2c08546afb01c938e3778a155488b15e326703f1':
  Enforce a timeout for Content Providers to be published.

8 years agoam 112c1dc6: am 6a8d1fd6: am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of...
Adam Lesinski [Tue, 22 Sep 2015 20:57:50 +0000 (20:57 +0000)]
am 112c1dc6: am 6a8d1fd6: am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev

* commit '112c1dc63adbc36b1bd50dac24d1ea39959ef0f2':
  Fix Array Index Out of Bounds in BatteryStatsImpl

8 years agoam d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into...
Baligh Uddin [Tue, 22 Sep 2015 20:56:05 +0000 (20:56 +0000)]
am d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev

* commit 'd2b597d1fdc99c512f1addfc817eea8d375a84ec':
  Enforce a timeout for Content Providers to be published.

8 years agoMerge "resolved conflicts for 5d7b68d4 to master"
Andreas Gampe [Tue, 22 Sep 2015 20:55:14 +0000 (20:55 +0000)]
Merge "resolved conflicts for 5d7b68d4 to master"

8 years agoMerge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev
Baligh Uddin [Tue, 22 Sep 2015 20:50:02 +0000 (20:50 +0000)]
Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev

8 years agoresolved conflicts for 5d7b68d4 to master
Andreas Gampe [Tue, 22 Sep 2015 20:41:39 +0000 (13:41 -0700)]
resolved conflicts for 5d7b68d4 to master

Change-Id: I6f56e8e11c35733f8d84346ca2b9a201784552e1

8 years agoMerge "Remove shader based gamma approach"
Chris Craik [Tue, 22 Sep 2015 20:41:38 +0000 (20:41 +0000)]
Merge "Remove shader based gamma approach"

8 years agoMerge "Restore more missing DirectoryFragment functionality."
Ben Kwa [Tue, 22 Sep 2015 20:28:02 +0000 (20:28 +0000)]
Merge "Restore more missing DirectoryFragment functionality."

8 years agoRestore more missing DirectoryFragment functionality.
Ben Kwa [Mon, 21 Sep 2015 17:49:52 +0000 (10:49 -0700)]
Restore more missing DirectoryFragment functionality.

- Add a material-style horizontal progress bar to DocumentsUI.  This
  replaces the old loading footer.
- Restore the view-switching code that displayed a dedicated "empty"
  view when displaying an empty directory.
- Fix tests.

Change-Id: Ifecb867f6edecbdeb37b8607d87d9797879a589d

8 years agoMerge "Allow color state list for vector drawable fill and stroke"
Alan Viverette [Tue, 22 Sep 2015 20:21:35 +0000 (20:21 +0000)]
Merge "Allow color state list for vector drawable fill and stroke"

8 years agoDismiss color fade when it is no longer used.
Michael Lentine [Tue, 22 Sep 2015 20:02:22 +0000 (13:02 -0700)]
Dismiss color fade when it is no longer used.

Previously the color fade layers would stay active until the screen was turned
back on. After this change, the layers are dismissed as soon as color fade
completes.

Bug: 24276564

Change-Id: I1f81b397d82d518c2bc921b22f7fe9fd066fc059

8 years agoam 36152328: am 0e766de7: Avoid calling scrollBy(0,0) on render
Diego Perez [Tue, 22 Sep 2015 20:05:30 +0000 (20:05 +0000)]
am 36152328: am 0e766de7: Avoid calling scrollBy(0,0) on render

* commit '361523281c88a7e453e0eef961ed7f16a55785a5':
  Avoid calling scrollBy(0,0) on render

8 years agoam 776fa57b: am aa311698: am 0361b18e: Merge "WrapperInit: remove dead execStandalone...
Elliott Hughes [Tue, 22 Sep 2015 20:04:29 +0000 (20:04 +0000)]
am 776fa57b: am aa311698: am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"

* commit '776fa57b2da75fb508d66cf0339dc7c4df9a5e55':
  WrapperInit: remove dead execStandalone method

8 years agoam d65fc9c4: (-s ours) am d8b47855: save "retain loader" state DO NOT MERGE
Todd Kennedy [Tue, 22 Sep 2015 20:03:43 +0000 (20:03 +0000)]
am d65fc9c4: (-s ours) am d8b47855: save "retain loader" state DO NOT MERGE

* commit 'd65fc9c4601f3fc5617ff0f72fcdb56581f0f223':
  save "retain loader" state DO NOT MERGE

8 years agoMake DPM/DPMS unit-testable
Makoto Onuki [Thu, 17 Sep 2015 17:28:24 +0000 (10:28 -0700)]
Make DPM/DPMS unit-testable

- Now all services that DPMS uses are injectable.
- Introduce some wrappers to make static methods and final class mockable.
(e.g. for Binder.getCallingUid())

- In unit tests we replace those with Mockito mocks, except we use a partial
mock for PackageManager, because we use way too many methods of this and
most of them are okay to use directly.

- To install a partial mock to PackageManager, I needed to make
ApplicationPackageManager @hide public non-final.

- For a starter, added tests for DPM.setAmin().

Bug 24061108

Change-Id: I2afd51d8bc0038992d5f9be38c686260be775b75

8 years agoMidiService: update listener with current status when registered
Phil Burk [Thu, 6 Aug 2015 06:32:54 +0000 (23:32 -0700)]
MidiService: update listener with current status when registered

This will give an app an opportunity to learn whether an input port is busy
before the user tries to connect and then fails.

Bug: 22825043
Change-Id: Ifede60f166dfe66ea15453044fce06f4a8452b18
Signed-off-by: Phil Burk <philburk@google.com>
8 years agoBluetoothMidiDevice: change write type to support JamStik
Phil Burk [Tue, 22 Sep 2015 19:07:31 +0000 (12:07 -0700)]
BluetoothMidiDevice: change write type to support JamStik

Temporarily use a Request instead of a Command so that the JamStik
will be properly enabled.

Bug: 24207964
Change-Id: I3d11732958c46e6039405b5969d5af0db8032fb9
Signed-off-by: Phil Burk <philburk@google.com>
8 years agoAllow color state list for vector drawable fill and stroke
Alan Viverette [Tue, 22 Sep 2015 19:03:50 +0000 (15:03 -0400)]
Allow color state list for vector drawable fill and stroke

Removes unnecessary invalidateSelf() from VD.onStateChange(). This is
handled by the view hosting the drawable.

Bug: 22984152
Change-Id: Idf11a0ffef392cb1d8452aa3f5f836b35027a756

8 years agoam 6a8d1fd6: am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in Batter...
Adam Lesinski [Tue, 22 Sep 2015 18:58:50 +0000 (18:58 +0000)]
am 6a8d1fd6: am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev

* commit '6a8d1fd62f73a241e7962b3baa3720a6dcd0767b':
  Fix Array Index Out of Bounds in BatteryStatsImpl

8 years agoRemove shader based gamma approach
Chris Craik [Tue, 22 Sep 2015 18:50:13 +0000 (11:50 -0700)]
Remove shader based gamma approach

Also fixes some INIT_LOGD logs

Change-Id: I212a71a1e7b366aea41f7c3c8cc169d509d6e4a2

8 years agoam 53ed452e: am 9ce68b24: am b49245f9: Merge "Frameworks/base: Propagate boot status...
Andreas Gampe [Tue, 22 Sep 2015 18:54:19 +0000 (18:54 +0000)]
am 53ed452e: am 9ce68b24: am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev

* commit '53ed452e86aa186b5903b65057b4473629292f0d':
  Frameworks/base: Propagate boot status to installd

8 years agoam dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl...
Adam Lesinski [Tue, 22 Sep 2015 18:50:56 +0000 (18:50 +0000)]
am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev

* commit 'dbca76cda1a2a6fa95c592654f8649cb30b65833':
  Fix Array Index Out of Bounds in BatteryStatsImpl

8 years agoam 9ce68b24: am b49245f9: Merge "Frameworks/base: Propagate boot status to installd...
Andreas Gampe [Tue, 22 Sep 2015 18:44:47 +0000 (18:44 +0000)]
am 9ce68b24: am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev

* commit '9ce68b24440a7bc326cad2d09940ccf750eb2b2a':
  Frameworks/base: Propagate boot status to installd

8 years agoam 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
Adam Lesinski [Tue, 22 Sep 2015 18:42:33 +0000 (18:42 +0000)]
am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev

* commit '1b57758a1bb814c3a00ec864fe164bfe7861a9ab':
  Fix Array Index Out of Bounds in BatteryStatsImpl

8 years agoam b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc...
Andreas Gampe [Tue, 22 Sep 2015 18:36:43 +0000 (18:36 +0000)]
am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev

* commit 'b49245f96233b7f89fb5d4ba52576131ca6fb47a':
  Frameworks/base: Propagate boot status to installd

8 years agoMerge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
Adam Lesinski [Tue, 22 Sep 2015 18:33:14 +0000 (18:33 +0000)]
Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev

8 years agoMerge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
Andreas Gampe [Tue, 22 Sep 2015 18:27:39 +0000 (18:27 +0000)]
Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev

8 years agoam 0e766de7: Avoid calling scrollBy(0,0) on render
Diego Perez [Tue, 22 Sep 2015 16:56:35 +0000 (16:56 +0000)]
am 0e766de7: Avoid calling scrollBy(0,0) on render

* commit '0e766de7c52d7e375e04676c93a872cb2d6eea63':
  Avoid calling scrollBy(0,0) on render

8 years agoAvoid calling scrollBy(0,0) on render
Diego Perez [Tue, 22 Sep 2015 10:08:35 +0000 (11:08 +0100)]
Avoid calling scrollBy(0,0) on render

Usually scrollBy(0, 0) won't have any effect but when called on the
NumberPicker but, in some cases, it seems to cause an endless loop.
When called from layoutlib, this will hold the read lock causing all
operations trying to acquire the write lock to block forever.

Bug: http://b.android.com/182506
Change-Id: Ib25427d3f32d804d1c481d979795eee71fbdbc6d

8 years agoam aa311698: am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"
Elliott Hughes [Tue, 22 Sep 2015 15:50:09 +0000 (15:50 +0000)]
am aa311698: am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"

* commit 'aa31169804dffa3b36654ccffe67a53f6ff4cdaf':
  WrapperInit: remove dead execStandalone method

8 years agoam 0361b18e: Merge "WrapperInit: remove dead execStandalone method"
Elliott Hughes [Tue, 22 Sep 2015 15:42:36 +0000 (15:42 +0000)]
am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"

* commit '0361b18ea10aa7987dbf8c4217d5f4c7e3a4a610':
  WrapperInit: remove dead execStandalone method

8 years agoMerge "WrapperInit: remove dead execStandalone method"
Elliott Hughes [Tue, 22 Sep 2015 15:34:26 +0000 (15:34 +0000)]
Merge "WrapperInit: remove dead execStandalone method"

8 years agoMerge "SubMenuBuilder.getRootMenu() should return root menu, not parent"
Alan Viverette [Tue, 22 Sep 2015 13:48:04 +0000 (13:48 +0000)]
Merge "SubMenuBuilder.getRootMenu() should return root menu, not parent"

8 years agoExtended the maximum pulsing duration when dozing
Selim Cinek [Tue, 22 Sep 2015 08:05:29 +0000 (10:05 +0200)]
Extended the maximum pulsing duration when dozing

Change-Id: Ib0f4cb4c7a011ce6df4100189b79ed4c2476c2c6