Jorim Jaggi
c204a065f9
am a6eaf8b3: am 82bb648b: am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev
...
* commit 'a6eaf8b38a21bda59ac202093a7dc926cd31f3a3':
Fix quick settings on Keyguard
2014-11-25 17:49:14 +00:00
John Spurlock
fc3fa08afc
am 98c2090d: am 98a20f68: am 4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev
...
* commit '98c2090de433a79d8b042652cfdccb1a03953176':
QS: Update data usage over limit title.
2014-11-25 17:49:01 +00:00
Jorim Jaggi
a6eaf8b38a
am 82bb648b: am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev
...
* commit '82bb648b5a1a5a4a0946a252a9cf9b6f8944a15d':
Fix quick settings on Keyguard
2014-11-25 17:38:26 +00:00
John Spurlock
98c2090de4
am 98a20f68: am 4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev
...
* commit '98a20f68e0f31c43d090b16e3802c67226dbd055':
QS: Update data usage over limit title.
2014-11-25 17:38:02 +00:00
Adrian Roos
019ab9981e
am e33017b4: am 20eb594a: am 8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev
...
* commit 'e33017b404c2ac0aff858439f9c6301ac887c1e2':
Revert "Only keep user switcher bitmaps if needed"
2014-11-25 15:15:44 +00:00
Chris Wren
2bf5a4205d
am ff47355d: am 865c73b5: am 1aa63f0b: Merge "Push back notification means snooze the package." into lmp-mr1-dev
...
* commit 'ff47355d2beb7257568ae9add24e99b3f3c185f7':
Push back notification means snooze the package.
2014-11-25 15:15:27 +00:00
Adrian Roos
e33017b404
am 20eb594a: am 8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev
...
* commit '20eb594ab27a9e4dee83574b3fe36a5a6d0d7807':
Revert "Only keep user switcher bitmaps if needed"
2014-11-25 15:09:39 +00:00
Chris Wren
ff47355d2b
am 865c73b5: am 1aa63f0b: Merge "Push back notification means snooze the package." into lmp-mr1-dev
...
* commit '865c73b5f66bfd1e5a9eded75b5a5fb24e701042':
Push back notification means snooze the package.
2014-11-25 15:09:12 +00:00
Jorim Jaggi
cb17416a8d
am 0da89b76: resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp
...
* commit '0da89b76402816dade084166a97b1d352ae1f78b':
Fixed several time related states for secondary users
2014-11-25 15:04:28 +00:00
Jorim Jaggi
0da89b7640
resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp
...
Change-Id: I8f1dbae2ecd14ae4e51a9e86eb6d36dd56a48be1
2014-11-25 15:34:56 +01:00
Geoff Mendal
5c571b5640
Merge "Import translations. DO NOT MERGE"
2014-11-24 21:15:43 +00:00
Jorim Jaggi
82bb648b5a
am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev
...
* commit '6b77074438f191de4fcfa1f1560fb5f038cb8173':
Fix quick settings on Keyguard
2014-11-24 20:01:19 +00:00
Geoff Mendal
4e657cf39b
Import translations. DO NOT MERGE
...
Change-Id: I80d19826bd33d1b0ef9570105df00aa13fb06e3b
Auto-generated-cl: translation import
2014-11-24 11:35:24 -08:00
Jorim Jaggi
6b77074438
Merge "Fix quick settings on Keyguard" into lmp-mr1-dev
2014-11-24 19:31:30 +00:00
Jorim Jaggi
58bef33499
Fix quick settings on Keyguard
...
- Fix that quick settings couldn't be scrolled nor closed on Keyguard
if scrolling was needed.
- Fix jumping in unlock motion when closing both panel and QS
- Fix invalid panel height when closing both QS and panel
Bug: 18481668
Change-Id: Ifd12e29bbc64f72f0dc13b43e36b1a57df7524fa
2014-11-24 20:30:42 +01:00
John Spurlock
98a20f68e0
am 4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev
...
* commit '4dfce43e976a294b3b575564c855214a8e5cef58':
QS: Update data usage over limit title.
2014-11-24 18:48:59 +00:00
John Spurlock
4dfce43e97
Merge "QS: Update data usage over limit title." into lmp-mr1-dev
2014-11-24 18:34:58 +00:00
Wink Saville
5c11e41b1a
am b4c54109: am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
...
* commit 'b4c5410987a6657b71fb0b86e1ef8337628241dc':
Additional changes to SubscriptionManager API as per API council.
2014-11-24 18:13:01 +00:00
Wink Saville
b4c5410987
am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
...
* commit '4f1cce63061976490e2e2cfc4085e1634d3a02de':
Additional changes to SubscriptionManager API as per API council.
2014-11-24 18:06:09 +00:00
John Spurlock
beaf117889
QS: Update data usage over limit title.
...
Bug: 18499916
Change-Id: I468eb40cbbbef52853c52e196e458d72f103765a
2014-11-24 12:25:32 -05:00
Adrian Roos
20eb594ab2
am 8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev
...
* commit '8a9242428b9d631ba841c166d062f158fd64f0f6':
Revert "Only keep user switcher bitmaps if needed"
2014-11-24 16:08:41 +00:00
Chris Wren
865c73b5f6
am 1aa63f0b: Merge "Push back notification means snooze the package." into lmp-mr1-dev
...
* commit '1aa63f0baf0df58ae22ecb2558a5de7cebd38654':
Push back notification means snooze the package.
2014-11-24 16:04:00 +00:00
Adrian Roos
8a9242428b
Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev
2014-11-24 16:03:56 +00:00
Chris Wren
1aa63f0baf
Merge "Push back notification means snooze the package." into lmp-mr1-dev
2014-11-24 15:58:17 +00:00
Selim Cinek
f0fc23a141
am 962b06f9: Merge "Fixed several time related states for secondary users" into lmp-mr1-dev
...
* commit '962b06f9a02f08392b6f87225a314ebf39dd7a07':
Fixed several time related states for secondary users
2014-11-24 11:57:59 +00:00
Selim Cinek
962b06f9a0
Merge "Fixed several time related states for secondary users" into lmp-mr1-dev
2014-11-24 11:52:40 +00:00
Wink Saville
4f1cce6306
am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
...
* commit '12c2136e556b54a717624d8479ec4650f363ce45':
Additional changes to SubscriptionManager API as per API council.
2014-11-22 20:28:10 +00:00
Wink Saville
d09c4cad65
Additional changes to SubscriptionManager API as per API council.
...
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
2014-11-22 10:08:16 -08:00
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
Chris Wren
a6d4fb60ed
Push back notification means snooze the package.
...
Bug: 18451923
Change-Id: I90160f9d14cde12a5bc03e46e64eedf770149a90
2014-11-21 15:51:41 -05:00
Jim Miller
879a4ee8b0
Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e
...
automerge: eab3240
2014-11-21 18:55:36 +00:00
Jim Miller
eab3240c78
Merge "Add multi-sim support to keyguard" into lmp-mr1-dev
...
automerge: 0284e5e
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
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
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
Selim Cinek
9c4a707912
Fixed several time related states for secondary users
...
The 24 hour setting was not respected correctly. Also
fixed a bug where the next alarm would not display itself
in the QS panel.
Bug: 16239208
Change-Id: I89734f783912dead5831db49db53fba04dbf54ee
2014-11-21 18:25:30 +01:00
Adrian Roos
c5db390f5b
Revert "Only keep user switcher bitmaps if needed"
...
This reverts commit cba0faadbe
2014-11-21 13:59:42 +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
2014-11-21 02:47:16 +00:00
