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

149802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Gunn
65bd3eaad6 Merge "Add supported URI scheme to PhoneAccounts. (1/4)" into lmp-dev 2014-09-03 18:12:58 +00:00
Tsuwei Chen
093e7bf110 am 09e97495: Merge "Adds carrier-specific GPS parameters. Bug: 17288144 Change-Id: Ibafef473221385b304f2ef77df7d9862b348cdf7" into lmp-dev 
* commit '09e97495ff236ce01f46ba9291048e01b27a27ea':
  Adds carrier-specific GPS parameters. Bug: 17288144 Change-Id: Ibafef473221385b304f2ef77df7d9862b348cdf7
 2014-09-03 18:01:55 +00:00
Christoph Studer
632003ddda am ccf36a07: Merge "SysUI: Suppress HUNs from non-profile users" into lmp-dev 
* commit 'ccf36a07417ba51d4bfa04edd2138dadadfe4923':
  SysUI: Suppress HUNs from non-profile users
 2014-09-03 18:01:51 +00:00
Matthew Williams
bbd04c6956 am f390c6ac: Merge "Add timeout when waiting to bind to JobService" into lmp-dev 
* commit 'f390c6ac2f65573e863fb563ded7ecdb3e839be4':
  Add timeout when waiting to bind to JobService
 2014-09-03 18:01:47 +00:00
Tsuwei Chen
897b59e394 Merge "Adds carrier-specific GPS parameters. Bug: 17288144 Change-Id: Ibafef473221385b304f2ef77df7d9862b348cdf7" into lmp-dev 2014-09-03 17:53:51 +00:00
Christoph Studer
6ca2e49f1b Merge "SysUI: Suppress HUNs from non-profile users" into lmp-dev 2014-09-03 17:52:56 +00:00
Jason Monk
720703baf5 am b0b16c1e: Merge "Add lock task checking to moving tasks to back" into lmp-dev 
* commit 'b0b16c1e5e48a81afebf5469f33f000fe999dbbc':
  Add lock task checking to moving tasks to back
 2014-09-03 17:50:20 +00:00
Craig Mautner
897cc79b96 am f17528b5: Merge "Unconditionally move stack to front." into lmp-dev 
* commit 'f17528b53cc6f91aa2de39251e01df1d6190c9f2':
  Unconditionally move stack to front.
 2014-09-03 17:50:09 +00:00
George Mount
54aa32cb01 am 62667650: Merge "Fix ChangeTransform to work with interruptions" into lmp-dev 
* commit '626676503844d2a90792011cd23b099109c8c9d7':
  Fix ChangeTransform to work with interruptions
 2014-09-03 17:49:57 +00:00
George Mount
7e492f2007 am dd815989: Merge "Additional fixes for "back" with translucent windows." into lmp-dev 
* commit 'dd8159896d9ebc138a01f538445280e5a1d5adae':
  Additional fixes for "back" with translucent windows.
 2014-09-03 17:49:54 +00:00
Esteban Talavera
64492996c8 am 5607db79: Merge "Pass ComponentName to probing certificate methods" into lmp-dev 
* commit '5607db79a3c17d948e717debc74a936ea47c1de8':
  Pass ComponentName to probing certificate methods
 2014-09-03 17:49:45 +00:00
Wally Yau
c3a65a17fa am afa51609: Merge "New keycode definitions for TV remotes." into lmp-dev 
* commit 'afa516092430324283256b568fe6b91fb88e82c8':
  New keycode definitions for TV remotes.
 2014-09-03 17:49:28 +00:00
Matthew Williams
5bdc16974a Merge "Add timeout when waiting to bind to JobService" into lmp-dev 2014-09-03 17:49:07 +00:00
Matthew Williams
75fc5258b7 Add timeout when waiting to bind to JobService 
BUG: 17322886

bindService() to an invalid service might never actually result in
onServiceConnected being called , for e.g. if the client service doesn't
actually implement JobService. This wastes an execution slot as we end
up waiting forever.

Also made the javadocs clearer for the JobScheduler class.

Change-Id: Ie15ebbe18c0b7579f2ab77dd46428d354ef632c3
 2014-09-03 10:47:27 -07:00
Jason Monk
327f7ebc01 Merge "Add lock task checking to moving tasks to back" into lmp-dev 2014-09-03 17:41:41 +00:00
Craig Mautner
db606d2b28 Merge "Unconditionally move stack to front." into lmp-dev 2014-09-03 17:35:19 +00:00
George Mount
66946e22b1 Merge "Fix ChangeTransform to work with interruptions" into lmp-dev 2014-09-03 17:30:24 +00:00
George Mount
d847f1a1e3 Merge "Additional fixes for "back" with translucent windows." into lmp-dev 2014-09-03 17:30:09 +00:00
George Mount
99c82fd1de Additional fixes for "back" with translucent windows. 
Ensure background is mutated before changing its alpha.
Ensure resetViews is called when activity options is set.

Bug 16215650

Change-Id: I8482532777652a93b2c0d05c1b902516d281baf0
 2014-09-03 17:29:57 +00:00
George Mount
dc19ac008c Fix ChangeTransform to work with interruptions 
Bug 17372872

If ChangeTransform was interrupted after its animation completed,
but before the parent's Transition completed, it would think
that its start location was relative to its parent's current
position and not relative to its end position.

Change-Id: Iad25aafc03c41c1e0a7530548fb38acafbaffb8e
 2014-09-03 17:29:06 +00:00
Esteban Talavera
aa924b52e9 Merge "Pass ComponentName to probing certificate methods" into lmp-dev 2014-09-03 17:22:41 +00:00
Christoph Studer
2f9dbbaee7 SysUI: Suppress HUNs from non-profile users 
Bug: 17364652
Change-Id: Ic7a971d64cecc1624b872c776efeaccd09144db7
 2014-09-03 19:20:56 +02:00
Jason Monk
a7a61594df Add lock task checking to moving tasks to back 
Chrome seems to use this method of moving itself to the back on
back presses, causing it to escape lock task mode.

Bug: 17365048
Change-Id: I2e8bc614f771951ed96cfc36f9789d12b1742e70
 2014-09-03 13:17:05 -04:00
Dake Gu
f01a449630 am a45b03f8: Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 
* commit 'a45b03f85cdfa792122a9301d508e106ce6aa6f6':
  ActivityTransition: fix activity not finished on back
 2014-09-03 17:16:57 +00:00
Tom Taylor
f88304d3a5 am 6fd9a12c: Change SmsManager.getSmsManagerForSubId to getSmsManagerUsingSubId 
* commit '6fd9a12c88c60431c759a80ea23b22efba898d6a':
  Change SmsManager.getSmsManagerForSubId to getSmsManagerUsingSubId
 2014-09-03 17:16:53 +00:00
Wally Yau
a25d54ffb0 Merge "New keycode definitions for TV remotes." into lmp-dev 2014-09-03 17:15:50 +00:00
Dake Gu
dd725ec4a7 Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 2014-09-03 17:07:09 +00:00
Evan Charlton
23dc241d5e Remove startActivityFromInCall API 
Rip out the startActivityFromInCall API until we can replace it with
something better.

Bug: 16988478
Change-Id: Ib7b0493353262d9e795d78b78a98dd29e7a3f88e
 2014-09-03 10:07:03 -07:00
Brian Carlstrom
a27e31a003 am ef3d85a5: Merge "Fix DevicePolicyManager javadoc" into lmp-dev 
* commit 'ef3d85a5d9de21c4569cc1bec4e696bbf44623a6':
  Fix DevicePolicyManager javadoc
 2014-09-03 17:06:17 +00:00
Selim Cinek
8b4362212b am f0c6717c: Merge "Tuned anti-falsing thresholds on the lockscreen" into lmp-dev 
* commit 'f0c6717c5c936f600027fb30ad5745fa16117e9a':
  Tuned anti-falsing thresholds on the lockscreen
 2014-09-03 17:06:11 +00:00
Selim Cinek
cf1cddf710 am e1327275: Merge "Fixed a bug where notification icons where not animating" into lmp-dev 
* commit 'e1327275ca5f9528609938672799da7edd5b7a5c':
  Fixed a bug where notification icons where not animating
 2014-09-03 17:06:08 +00:00
Adrian Roos
ef620ccdd6 am 39dd16c8: Merge "Auto dismiss lockscreen when switching to guest" into lmp-dev 
* commit '39dd16c8f35d0fdd01c25bf51c01b71726819eae':
  Auto dismiss lockscreen when switching to guest
 2014-09-03 17:05:55 +00:00
Chet Haase
a4673b1c74 am c22d9103: Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev 
* commit 'c22d910342406a71094ace8f10a898ea9de360ca':
  Fix TransitionManager.go() to allow null transitions
 2014-09-03 17:05:29 +00:00
Winson Chung
edff4e442e am bf5c26f5: Merge "Fixing Recents crash with non-primary user. (Bug 17343688)" into lmp-dev 
* commit 'bf5c26f50b3b8dd48dcc94d4a39a5094f8494237':
  Fixing Recents crash with non-primary user. (Bug 17343688)
 2014-09-03 17:05:26 +00:00
Chet Haase
bd1dcd5319 am aa83bc85: Merge "Fix behavior of inflating InsetDrawable" into lmp-dev 
* commit 'aa83bc85c0e27feb9d376c6e786a9666dedbf231':
  Fix behavior of inflating InsetDrawable
 2014-09-03 17:05:22 +00:00
Jorim Jaggi
ceec3bffcc am 44542c46: Merge "Improve subpixel rendering of battery icon on all densities" into lmp-dev 
* commit '44542c4672eb2dc8626beace99dda809f73ba2ae':
  Improve subpixel rendering of battery icon on all densities
 2014-09-03 17:05:19 +00:00
Selim Cinek
e76d7b39d4 am 6dbb3ec5: Merge "Correctly forwarding the screen off event on lockscreen" into lmp-dev 
* commit '6dbb3ec5d1d7e88e86739ff9068f9106b4663389':
  Correctly forwarding the screen off event on lockscreen
 2014-09-03 17:05:16 +00:00
Santos Cordon
7cdcce8071 am 708a680e: Merge "Fix NPE in onDestroy." into lmp-dev 
* commit '708a680e630c452ff701203da69d69d8e674d4f1':
  Fix NPE in onDestroy.
 2014-09-03 17:05:12 +00:00
Youngsang Cho
38aa4a4f42 am 797b2b0d: Merge "Add a warning log when it takes long time to handle a message in TIS" into lmp-dev 
* commit '797b2b0de4246fabf9680babde907bd864cd639c':
  Add a warning log when it takes long time to handle a message in TIS
 2014-09-03 17:05:07 +00:00
George Mount
ddc5bd84b6 am 10e15c3a: Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 
* commit '10e15c3ad6d5395c38c73b72aff4267eed0a66b8':
  Make Fragment Transitions match Acitivty Transitions API
 2014-09-03 17:05:03 +00:00
Jason Monk
a12504342f am 46295dc1: Merge "Don\'t show add user for simple user switcher" into lmp-dev 
* commit '46295dc11a3224b39aa4ac87c49a21bd9c1126f4':
  Don't show add user for simple user switcher
 2014-09-03 17:04:59 +00:00
Jason Monk
59a32aff73 am 9df55f5e: Merge "Correct hotspot notification asset" into lmp-dev 
* commit '9df55f5e29729457b4364a2d761600da9de065a6':
  Correct hotspot notification asset
 2014-09-03 17:04:55 +00:00
Jason Monk
1021a4d1a0 am 7023f0f2: Merge "Enforce permissions on start/stopLockTaskModeOnCurrent" into lmp-dev 
* commit '7023f0f25871c48d952f9c8cdd3985c04bb8d237':
  Enforce permissions on start/stopLockTaskModeOnCurrent
 2014-09-03 17:04:52 +00:00
Jorim Jaggi
c6786bdb43 am 947de838: Merge "Status bar iconography updates" into lmp-dev 
* commit '947de838385f3d0c271ff82d238ac58ba609acde':
  Status bar iconography updates
 2014-09-03 17:04:42 +00:00
Christoph Studer
717ad1da29 am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 
* commit '342ece751b683d4532e273f196f4f99dfc569067':
  NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
 2014-09-03 17:04:38 +00:00
Sander Alewijnse
66b4040c05 am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev 
* commit '727738ada473ae5e905a1c3c38f136b2669f6b5e':
  Add the provisioning extra admin extras bundle.
 2014-09-03 17:04:33 +00:00
Yohei Yukawa
b2745fabdd am ebb6b422: Merge "API Review: InputConnection" into lmp-dev 
* commit 'ebb6b4224ee02b2ef7ae5d58c9e7cdf3ab16b090':
  API Review: InputConnection
 2014-09-03 17:04:21 +00:00
Lorenzo Colitti
1548796fbf am 1ae4e750: Merge "Kill the NetworkInfo(int type) constructor. IT\'S A TRAP!" into lmp-dev 
* commit '1ae4e750dd822edda13ee68c827f977b6e533fc5':
  Kill the NetworkInfo(int type) constructor. IT'S A TRAP!
 2014-09-03 17:04:11 +00:00
Tom Taylor
ca015d7625 Change SmsManager.getSmsManagerForSubId to getSmsManagerUsingSubId 
Bug 17371475

Change-Id: I2da8e355a3c7b037b55d38484c903f7f387aa97c
 2014-09-03 10:04:04 -07:00
Craig Mautner
02a4aa261c Unconditionally move stack to front. 
Recents was depending on using moveTaskToFront() to also move the
task's stack to the front. But that only works if the task is
actually in the stack because moveTaskToFront() doesn't do the
stack movement if the task is no longer in the stack. This change
calls ActivityStack.moveToFront() in addition to moveTaskToFront().

Fixes bug 17361027.

Also logs callingUid when starting an activity.

Change-Id: I023f956bafae00f45c58757ff5707ce520f02b55
 2014-09-03 10:03:57 -07:00