Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
174,869 Commits 3 Branches 0 Tags
4a7b19f18afc1bd50f8ebbb02494a2af8bcf4fa4
Commit Graph

8841 Commits

Author SHA1 Message Date
Winson Chung
4a7b19f18a am 161b51ba: am 207356ef: am 71113e43: Merge "Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)" into lmp-mr1-dev 
* commit '161b51ba065fb54c3b983db61eb3dc48a0e0a855':
  Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)
 2014-11-22 00:00:25 +00:00
Winson Chung
161b51ba06 am 207356ef: am 71113e43: Merge "Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)" into lmp-mr1-dev 
* commit '207356efae596b3860a384ced5f369462ce342d7':
  Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)
 2014-11-21 23:24:14 +00:00
Winson Chung
207356efae am 71113e43: Merge "Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)" into lmp-mr1-dev 
* commit '71113e43e768d973b3721f8fac9f9654ed159911':
  Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)
 2014-11-21 23:19:38 +00:00
Winson Chung
71113e43e7 Merge "Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)" into lmp-mr1-dev 2014-11-21 23:15:04 +00:00
Jim Miller
7cc0a1f1bb am 879a4ee8: Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e automerge: eab3240 
* commit '879a4ee8b09e879de890dbbbc34629cd297572eb':
  Add multi-sim support to keyguard
 2014-11-21 22:32:40 +00:00
Winson Chung
bc571a9807 Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310) 
This will remove the need for having all the null checks in TaskStackView.
We also remove the check when launching tasks (the fail case is worse
when the activity fails to load).  And the CL also fix the header focus
animation, and an issue with tasks not getting laid out when the stack is
set again.

Change-Id: I9b4cd50d76f72ba3d16dd1b8e2d9bbf9f1f24d2b
 2014-11-21 14:00:17 -08:00
Jim Miller
879a4ee8b0 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e 
automerge: eab3240

* commit 'eab3240c78423e791a7f36864f55f94c25a5aba5':
  Add multi-sim support to keyguard
 2014-11-21 18:55:36 +00:00
Jim Miller
eab3240c78 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev 
automerge: 0284e5e

* commit '0284e5e49864a6e039d77210bbea0a013b0e23ec':
  Add multi-sim support to keyguard
 2014-11-21 18:53:10 +00:00
Jim Miller
0284e5e498 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev 2014-11-21 18:38:03 +00:00
Adrian Roos
c7cf8cca6b am 26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev automerge: 0108d98 
automerge: 034b909

* commit '034b9092fb93f03e6e723ac6eac8d8d0e8c4048a':
  Explicitly specify user for public mode
 2014-11-21 18:26:41 +00:00
Adrian Roos
034b9092fb am 26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev 
automerge: 0108d98

* commit '0108d9836971d9f40bf7856d1858ecc4b153e511':
  Explicitly specify user for public mode
 2014-11-21 18:04:23 +00:00
Adrian Roos
0108d98369 am 26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev 
* commit '26750711e12900aca6c7c35556b4548038cfb505':
  Explicitly specify user for public mode
 2014-11-21 18:02:26 +00:00
Adrian Roos
31b844ba0c Explicitly specify user for public mode 
Bug: 18417850
Change-Id: I9d564a47fe66cb8035d73c8a2eedb912920410a2
 2014-11-21 13:55:09 +01:00
John Spurlock
46803a438c am dc3e7d28: am ed06df13: am 1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev 
* commit 'dc3e7d282c7be63388190fcf0c168735ceb9cafe':
  Doze: Make proximity check configurable.
 2014-11-21 12:18:54 +00:00
John Spurlock
dc3e7d282c am ed06df13: am 1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev 
* commit 'ed06df131467ce29017f20cfd25068dd3ba95759':
  Doze: Make proximity check configurable.
 2014-11-21 03:45:30 +00:00
John Spurlock
ed06df1314 am 1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev 
* commit '1bd81e31f31a6d8dc06af79985ca820effab970c':
  Doze: Make proximity check configurable.
 2014-11-21 03:40:45 +00:00
John Spurlock
686e4d57d8 Doze: Make proximity check configurable. 
Default to true, but make it available for overlay or setting
at runtime.

Bug: 18373928
Change-Id: I6abc1924ea0f03620f4683dc055f64ede5782809
 2014-11-20 21:59:13 -05:00
Adrian Roos
4d4254fdc3 am 2a5663d5: am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev automerge: 62a7d53 
* commit '2a5663d524a29cc33137a6651660506398d0633a':
  Add device locked API for TrustAgentService
 2014-11-21 02:58:07 +00:00
Adrian Roos
2a5663d524 am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 
automerge: 62a7d53

* commit '62a7d5334315b4153f1da1112f945d13f72e0381':
  Add device locked API for TrustAgentService
 2014-11-21 02:47:16 +00:00
Winson Chung
a0715af6b1 am de04d557: am 7c122b60: Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 
automerge: 4ddbed3

* commit '4ddbed3d1fd569c41d0a64b3c37447cde572b36a':
  Use SystemClock time to keep track of last event times. (Bug 17995039)
 2014-11-21 01:56:39 +00:00
Winson Chung
4ddbed3d1f am de04d557: am 7c122b60: Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 
* commit 'de04d5573af33aa4357ec2e97708f07c30265333':
  Use SystemClock time to keep track of last event times. (Bug 17995039)
 2014-11-21 00:44:15 +00:00
Adrian Roos
62a7d53343 am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 
* commit '4e312d81c18b286170c904659e78cab4fdf27200':
  Add device locked API for TrustAgentService
 2014-11-20 21:41:46 +00:00
Adrian Roos
4e312d81c1 Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 2014-11-20 21:38:17 +00:00
Jorim Jaggi
87f0819327 am c51fdd1b: am bf1960ce: Merge "Fade notifications when exiting dozing" into lmp-mr1-dev automerge: 6456513 
* commit 'c51fdd1bbf507862c10686458d2486f57a5b9585':
  Fade notifications when exiting dozing
 2014-11-20 21:34:40 +00:00
Selim Cinek
230dc9dfc8 am 8e781107: am b18cbb9a: Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev automerge: c9a39c7 
* commit '8e7811079576040207377e9063ad68c757f61d9a':
  Fixed a bug where the notifications were not animating
 2014-11-20 21:34:35 +00:00
Adrian Roos
d1d88bc8c6 am 4533e197: am cbd48c72: Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev automerge: 71cf9e5 
* commit '4533e197bf999c6b68bdb04cad7d4bdee80b6448':
  Honey I shrunk the navigation bar
 2014-11-20 21:34:15 +00:00
Jorim Jaggi
c51fdd1bbf am bf1960ce: Merge "Fade notifications when exiting dozing" into lmp-mr1-dev 
automerge: 6456513

* commit '6456513f6ff844fd15f3453a66fcc8fb439e1ef7':
  Fade notifications when exiting dozing
 2014-11-20 21:31:41 +00:00
Selim Cinek
8e78110795 am b18cbb9a: Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev 
automerge: c9a39c7

* commit 'c9a39c7dd1e50bea6b6ba9abc20dafe3204aece7':
  Fixed a bug where the notifications were not animating
 2014-11-20 21:30:17 +00:00
John Spurlock
6775a97389 am 224a0640: am ef86a828: Merge "QS: Inversion tile: Don\'t consider initial 0 setting trackable." into lmp-mr1-dev automerge: ae08003 
* commit '224a0640c988a33aace9b2a81548613067fb7ca8':
  QS: Inversion tile: Don't consider initial 0 setting trackable.
 2014-11-20 21:29:32 +00:00
Adrian Roos
4533e197bf am cbd48c72: Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev 
automerge: 71cf9e5

* commit '71cf9e58a14b942ad313d0c5c280e207933e9841':
  Honey I shrunk the navigation bar
 2014-11-20 21:26:00 +00:00
John Spurlock
224a0640c9 am ef86a828: Merge "QS: Inversion tile: Don\'t consider initial 0 setting trackable." into lmp-mr1-dev 
automerge: ae08003

* commit 'ae08003115488e08b69e0db2e75eca56405bd928':
  QS: Inversion tile: Don't consider initial 0 setting trackable.
 2014-11-20 21:24:31 +00:00
Jason Monk
9c6e3c67b6 am 16b03c9a: am 2e982258: Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev automerge: bdf37b7 
* commit '16b03c9a73aebd71d66ae379348eca81be676ef5':
  SysUI: Refactor the NetworkControllerImpl
 2014-11-20 21:07:37 +00:00
Jason Monk
16b03c9a73 am 2e982258: Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 
automerge: bdf37b7

* commit 'bdf37b714d4c3e3fb0ac27c625fdcffbd616b4f9':
  SysUI: Refactor the NetworkControllerImpl
 2014-11-20 21:00:19 +00:00
Adrian Roos
481a6df99f Add device locked API for TrustAgentService 
Bug: 18414067
Change-Id: I96c68af9ccc9940acf9fab3b5bd39a3485f01045
 2014-11-20 21:48:38 +01:00
Jim Miller
52a6133f4b Add multi-sim support to keyguard 
Use new telephony APIs.
Clean up SIM state machine code.
Use cached copy of SubscriptionInfo.
Make SIM PIN and SIM PUK work.

Tested on single and multi-SIM devices.

Fixes bug 18147652

Change-Id: Ic69a4d2898999a5438e6a70b5851705bc05443f1
 2014-11-20 21:36:52 +01:00
Winson Chung
de04d5573a am 7c122b60: Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 
* commit '7c122b60b93c9ef4fa428bc142ea61bf4252b70b':
  Use SystemClock time to keep track of last event times. (Bug 17995039)
 2014-11-20 18:54:47 +00:00
Winson Chung
7c122b60b9 Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 2014-11-20 18:50:50 +00:00
Jorim Jaggi
6456513f6f am bf1960ce: Merge "Fade notifications when exiting dozing" into lmp-mr1-dev 
* commit 'bf1960ce9c353267490d65cc1b8beacc7dd85347':
  Fade notifications when exiting dozing
 2014-11-20 17:31:55 +00:00
Jorim Jaggi
bf1960ce9c Merge "Fade notifications when exiting dozing" into lmp-mr1-dev 2014-11-20 17:25:49 +00:00
Selim Cinek
c9a39c7dd1 am b18cbb9a: Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev 
* commit 'b18cbb9a19d2213c0a5b1feecee5e9d4e88125c4':
  Fixed a bug where the notifications were not animating
 2014-11-20 17:06:08 +00:00
Selim Cinek
b18cbb9a19 Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev 2014-11-20 17:01:24 +00:00
Selim Cinek
7b8157ef23 Fixed a bug where the notifications were not animating 
Bug: 18463381
Change-Id: I1064535f120dbc334a10d70b7fef232adb08a45f
 2014-11-20 16:04:00 +01:00
Adrian Roos
71cf9e58a1 am cbd48c72: Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev 
* commit 'cbd48c722a40aff8bc2855d735bd34159b5df8ba':
  Honey I shrunk the navigation bar
 2014-11-20 14:58:49 +00:00
Adrian Roos
cbd48c722a Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev 2014-11-20 14:54:32 +00:00
Adrian Roos
306354f040 Honey I shrunk the navigation bar 
Bug: 18412658
Bug: 18463755
Change-Id: I3e379bf22f0d83a3c7c477908b0847fc18325f12
 2014-11-20 14:31:02 +00:00
John Spurlock
ae08003115 am ef86a828: Merge "QS: Inversion tile: Don\'t consider initial 0 setting trackable." into lmp-mr1-dev 
* commit 'ef86a828146d28755b7dc1e0f5a5a41d0a9fc56f':
  QS: Inversion tile: Don't consider initial 0 setting trackable.
 2014-11-20 13:24:03 +00:00
John Spurlock
18764bf551 QS: Inversion tile: Don't consider initial 0 setting trackable. 
For usage tracking purposes, seeing a setting value of 1 is always
considered trackable.

However, only consider a setting value of 0 as trackable if we've
observed a change (from 1).  Avoids tracking a db update from null
to 0 (via settings cmd or a restore).

Bug: 18062541
Change-Id: Ic8413b1770040f9ef28041bbadb4e5fb62d1c014
 2014-11-19 21:07:04 -05:00
Jason Monk
bdf37b714d am 2e982258: Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 
* commit '2e982258f10e9af21ec328faf41e77b38b109738':
  SysUI: Refactor the NetworkControllerImpl
 2014-11-19 21:22:29 +00:00
Jason Monk
2e982258f1 Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 2014-11-19 21:18:22 +00:00
John Spurlock
ee33301aae am 34a2ee69: am 9d48ec7a: am 2ee054b4: Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 
* commit '34a2ee695d7411c6b9abd7db3fd105851092bafb':
  Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
 2014-11-19 18:05:28 +00:00