170324 Commits

Author SHA1 Message Date
Svet Ganov
026e959d11 am 0abcda59: am fdef09ec: Merge "Sometimes historical printers not properly ordered." into lmp-mr1-dev
* commit '0abcda5929aac1746219c87dbdd26c33d990f3c6':
  Sometimes historical printers not properly ordered.
2014-10-24 16:52:44 +00:00
Selim Cinek
edac8c895a am 31e307e6: am 1b459f89: Merge "Cleaned up status bar closing handling" into lmp-mr1-dev
* commit '31e307e6009c6461c8abc06a25d1be834e11d2a5':
  Cleaned up status bar closing handling
2014-10-24 16:52:39 +00:00
Svet Ganov
0abcda5929 am fdef09ec: Merge "Sometimes historical printers not properly ordered." into lmp-mr1-dev
* commit 'fdef09ecef877605f47cc763eb497364f27e5c45':
  Sometimes historical printers not properly ordered.
2014-10-24 16:48:26 +00:00
Selim Cinek
31e307e600 am 1b459f89: Merge "Cleaned up status bar closing handling" into lmp-mr1-dev
* commit '1b459f89a738fa913ed12fe893e435b2f6cc9416':
  Cleaned up status bar closing handling
2014-10-24 16:48:21 +00:00
Svet Ganov
fdef09ecef Merge "Sometimes historical printers not properly ordered." into lmp-mr1-dev 2014-10-24 16:42:18 +00:00
Selim Cinek
1b459f89a7 Merge "Cleaned up status bar closing handling" into lmp-mr1-dev 2014-10-24 16:41:19 +00:00
Luan Nguyen
aec7c974eb am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
* commit '049db36afd63b972f971f8bac6a405bc2f9437f4':
  docs: fixed typo/grammar issues.
2014-10-24 15:59:44 +00:00
Luan Nguyen
049db36afd Merge "docs: fixed typo/grammar issues." into klp-modular-docs 2014-10-24 15:55:48 +00:00
Selim Cinek
dbbcfbe8ae Cleaned up status bar closing handling
This could lead to a bug where there was a hole in the shade.

Bug: 17961295
Change-Id: Ief4bb3f79433a062c4904329e7ca130987d7fe0f
2014-10-24 17:52:35 +02:00
Christoph Studer
a6ca04e6eb am 438238ee: am 629a9a0b: am 6709fba9: Merge "SysUI: Reset ExpandableNotiRow.mActualHeight on reset()" into lmp-mr1-dev
* commit '438238eefa3b4308ae8d01643ffcd79dc7088d65':
  SysUI: Reset ExpandableNotiRow.mActualHeight on reset()
2014-10-24 15:32:08 +00:00
Jason Monk
e3aecc01a6 am b22d1002: am 730409c3: am 013d14f8: Merge "Make lock task check if focused better" into lmp-mr1-dev
* commit 'b22d1002d1751cfec2f62dedb23ec31085103e14':
  Make lock task check if focused better
2014-10-24 15:27:49 +00:00
Christoph Studer
438238eefa am 629a9a0b: am 6709fba9: Merge "SysUI: Reset ExpandableNotiRow.mActualHeight on reset()" into lmp-mr1-dev
* commit '629a9a0b392026169287fde5d168593fa228ec55':
  SysUI: Reset ExpandableNotiRow.mActualHeight on reset()
2014-10-24 15:26:03 +00:00
Jason Monk
b22d1002d1 am 730409c3: am 013d14f8: Merge "Make lock task check if focused better" into lmp-mr1-dev
* commit '730409c332e19c34f7c309fbe054532eec88bdbc':
  Make lock task check if focused better
2014-10-24 15:20:55 +00:00
Christoph Studer
629a9a0b39 am 6709fba9: Merge "SysUI: Reset ExpandableNotiRow.mActualHeight on reset()" into lmp-mr1-dev
* commit '6709fba99e76480ae2728a7832c0c9796a11658a':
  SysUI: Reset ExpandableNotiRow.mActualHeight on reset()
2014-10-24 15:20:40 +00:00
Jason Monk
730409c332 am 013d14f8: Merge "Make lock task check if focused better" into lmp-mr1-dev
* commit '013d14f887a8b317d60bd65fa3d3bbb215095cb4':
  Make lock task check if focused better
2014-10-24 15:16:23 +00:00
Christoph Studer
6709fba99e Merge "SysUI: Reset ExpandableNotiRow.mActualHeight on reset()" into lmp-mr1-dev 2014-10-24 15:15:03 +00:00
Selim Cinek
ab2e9c7c55 am 1aa2876c: am 962c5ab8: am 2985dd76: Merge "Fixed a bug where the indication text could get too high" into lmp-mr1-dev
* commit '1aa2876c3727a23434f7e41447e728a4fba6f231':
  Fixed a bug where the indication text could get too high
2014-10-24 15:14:20 +00:00
Jason Monk
013d14f887 Merge "Make lock task check if focused better" into lmp-mr1-dev 2014-10-24 15:09:39 +00:00
Christoph Studer
a275184b46 am c4f03e9f: am 8b417054: am 55abbfa0: Merge "NoMan: Log canceled notifications" into lmp-mr1-dev
* commit 'c4f03e9fcfeb5b34a4016e241e7910f16db3f1f8':
  NoMan: Log canceled notifications
2014-10-24 15:08:46 +00:00
Selim Cinek
1aa2876c37 am 962c5ab8: am 2985dd76: Merge "Fixed a bug where the indication text could get too high" into lmp-mr1-dev
* commit '962c5ab8490c268ec55feff98466fab654116ea1':
  Fixed a bug where the indication text could get too high
2014-10-24 15:08:22 +00:00
Christoph Studer
c4f03e9fcf am 8b417054: am 55abbfa0: Merge "NoMan: Log canceled notifications" into lmp-mr1-dev
* commit '8b4170547ee118b0b7f8fae2cbba1b799f91d2b4':
  NoMan: Log canceled notifications
2014-10-24 15:03:13 +00:00
Selim Cinek
962c5ab849 am 2985dd76: Merge "Fixed a bug where the indication text could get too high" into lmp-mr1-dev
* commit '2985dd763b21c63f54ef3d5f26cae249480ea05a':
  Fixed a bug where the indication text could get too high
2014-10-24 15:03:06 +00:00
Tyler Gunn
23bcc29286 am c89c7be4: am 43ac9389: am 3682ced7: Merge "Propagating isMultiParty indicator from RIL up into Telephony layer." into lmp-mr1-dev
* commit 'c89c7be438c6894abf36bfbdea5217ada3e30442':
  Propagating isMultiParty indicator from RIL up into Telephony layer.
2014-10-24 15:01:22 +00:00
Christoph Studer
8b4170547e am 55abbfa0: Merge "NoMan: Log canceled notifications" into lmp-mr1-dev
* commit '55abbfa0ed92a742506175ab50e983a80a9bdabe':
  NoMan: Log canceled notifications
2014-10-24 14:58:53 +00:00
Selim Cinek
2985dd763b Merge "Fixed a bug where the indication text could get too high" into lmp-mr1-dev 2014-10-24 14:57:01 +00:00
Christoph Studer
55abbfa0ed Merge "NoMan: Log canceled notifications" into lmp-mr1-dev 2014-10-24 14:53:37 +00:00
Tyler Gunn
c89c7be438 am 43ac9389: am 3682ced7: Merge "Propagating isMultiParty indicator from RIL up into Telephony layer." into lmp-mr1-dev
* commit '43ac9389bb7f19078e4d1ecd2d87bde3262ad6be':
  Propagating isMultiParty indicator from RIL up into Telephony layer.
2014-10-24 14:53:16 +00:00
Tyler Gunn
43ac9389bb am 3682ced7: Merge "Propagating isMultiParty indicator from RIL up into Telephony layer." into lmp-mr1-dev
* commit '3682ced751ee86f87a0af84a17f027e134c2f23e':
  Propagating isMultiParty indicator from RIL up into Telephony layer.
2014-10-24 14:47:45 +00:00
Christoph Studer
aac0c2673b am 7ffa8dad: am c10f39d5: am 5c1a4965: Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev
* commit '7ffa8dad6fc5210bc4b851e458f4a63486604234':
  SysUI/NoMan: Log clicks on notification buttons
2014-10-24 14:44:15 +00:00
Tyler Gunn
3682ced751 Merge "Propagating isMultiParty indicator from RIL up into Telephony layer." into lmp-mr1-dev 2014-10-24 14:41:14 +00:00
Christoph Studer
7ffa8dad6f am c10f39d5: am 5c1a4965: Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev
* commit 'c10f39d536aebbdd7d6b30ac2dfcfcf6b51772f8':
  SysUI/NoMan: Log clicks on notification buttons
2014-10-24 14:38:25 +00:00
Christoph Studer
81e5b5f2f8 NoMan: Log canceled notifications
In addition to logging cancelation command, also log actually
canceled notifications via the new eventlog tag notification_canceled.

Bug: 18083122
Change-Id: I1e3e1e1368f39519f34c002ae374f318f647a401
2014-10-24 16:34:54 +02:00
Adrian Roos
e87ea3b00c am e1ebc94c: am e5c5b948: am e01f4e27: Merge "Set the right expanded state" into lmp-mr1-dev
* commit 'e1ebc94c7b861139d6d990bb7f1e876b35bdabf3':
  Set the right expanded state
2014-10-24 14:34:26 +00:00
Christoph Studer
c10f39d536 am 5c1a4965: Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev
* commit '5c1a49651b4e0a15a938560394bffeaeb5718f72':
  SysUI/NoMan: Log clicks on notification buttons
2014-10-24 14:33:59 +00:00
Adrian Roos
e1ebc94c7b am e5c5b948: am e01f4e27: Merge "Set the right expanded state" into lmp-mr1-dev
* commit 'e5c5b948c77d586fe677eaf56445404670b61d39':
  Set the right expanded state
2014-10-24 14:29:49 +00:00
Christoph Studer
5c1a49651b Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev 2014-10-24 14:29:20 +00:00
Adrian Roos
e5c5b948c7 am e01f4e27: Merge "Set the right expanded state" into lmp-mr1-dev
* commit 'e01f4e273803f4f971032261ea0a92ceeaa5a926':
  Set the right expanded state
2014-10-24 14:24:11 +00:00
Adrian Roos
e01f4e2738 Merge "Set the right expanded state" into lmp-mr1-dev 2014-10-24 14:19:36 +00:00
Jason Monk
2fb1eec715 am 55606158: am 467f9efe: am 104d2484: Merge "Show screen pinning toasts on all users" into lmp-mr1-dev
* commit '5560615871e8e1bf3a9c8c6f606319c076fdf03a':
  Show screen pinning toasts on all users
2014-10-24 14:10:04 +00:00
Jason Monk
042a9cc121 am fbebf9d0: am 4e904890: am ef255fce: Merge "Fix talkback name of screen pinning button" into lmp-mr1-dev
* commit 'fbebf9d031e458bda135c5e7e55ff2ad6e724e99':
  Fix talkback name of screen pinning button
2014-10-24 14:10:00 +00:00
Jason Monk
5560615871 am 467f9efe: am 104d2484: Merge "Show screen pinning toasts on all users" into lmp-mr1-dev
* commit '467f9efe897cccc5deec5ee62fc33133fabe10e1':
  Show screen pinning toasts on all users
2014-10-24 14:04:45 +00:00
Jason Monk
fbebf9d031 am 4e904890: am ef255fce: Merge "Fix talkback name of screen pinning button" into lmp-mr1-dev
* commit '4e904890c619e1eaf899ffe635c213e4b89d8c0e':
  Fix talkback name of screen pinning button
2014-10-24 14:04:40 +00:00
Jason Monk
467f9efe89 am 104d2484: Merge "Show screen pinning toasts on all users" into lmp-mr1-dev
* commit '104d2484ec605d9673e74cc125d92d41b6968327':
  Show screen pinning toasts on all users
2014-10-24 14:00:25 +00:00
Jason Monk
4e904890c6 am ef255fce: Merge "Fix talkback name of screen pinning button" into lmp-mr1-dev
* commit 'ef255fce94e857a071ef6d0485e33d234fbad0f0':
  Fix talkback name of screen pinning button
2014-10-24 14:00:21 +00:00
Jason Monk
104d2484ec Merge "Show screen pinning toasts on all users" into lmp-mr1-dev 2014-10-24 13:55:55 +00:00
Jason Monk
ef255fce94 Merge "Fix talkback name of screen pinning button" into lmp-mr1-dev 2014-10-24 13:54:58 +00:00
Adrian Roos
8b70c1e29b am 621823e0: am 53f30ec2: am bcd07652: Add API for querying trusted state
* commit '621823e0641b883684e7f9e8c705f0dc69dd02ce':
  Add API for querying trusted state
2014-10-24 13:33:30 +00:00
Adrian Roos
621823e064 am 53f30ec2: am bcd07652: Add API for querying trusted state
* commit '53f30ec270db8c6b92ff06579cf4c591efe2544b':
  Add API for querying trusted state
2014-10-24 13:27:39 +00:00
Adrian Roos
53f30ec270 am bcd07652: Add API for querying trusted state
* commit 'bcd076525ccb8a3dfe7d1002bcae059661c1d111':
  Add API for querying trusted state
2014-10-24 13:21:30 +00:00
Adrian Roos
2ace72544a SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState
Bug: 18084166
Change-Id: I7d8695f4b576676cc6da1fe07fea05e72d04f33e
2014-10-24 14:35:26 +02:00