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

165461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jason Monk
013d14f887 Merge "Make lock task check if focused better" into lmp-mr1-dev 2014-10-24 15:09:39 +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
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
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
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
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
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
Adrian Roos
bcd076525c Add API for querying trusted state 
Bug: 18084166
Change-Id: Ic755461cc6978943aef4943def93a0e38a1c96c0
 2014-10-24 13:59:45 +02:00
Narayan Kamath
0d50b5d0ee am e572a77f: am fa36b36c: Merge "Deprecate more apache-http." into lmp-mr1-dev 
* commit 'e572a77f05948fdc9c17ccdce0784d8b179a03ee':
  Deprecate more apache-http.
 2014-10-24 10:40:00 +00:00
Narayan Kamath
8e5cf189f1 am 2f348393: am 7eafd944: Merge "Deprecate apache-http." into lmp-mr1-dev 
* commit '2f3483939e7cc0cf99c3154896604857af3a2c1a':
  Deprecate apache-http.
 2014-10-24 10:39:54 +00:00
Yuncheol Heo
b10d25fc96 am ddb863f4: am 5b062e07: Merge "CEC: Fix apilint errors." into lmp-mr1-dev 
* commit 'ddb863f42832e5dcc0f5167ce5ba7ecea2d977a4':
  CEC: Fix apilint errors.
 2014-10-24 10:39:50 +00:00
Neil Fuller
a021e92218 resolved conflicts for merge of 12260ad7 to lmp-mr1-dev-plus-aosp 
Change-Id: Ie2222794208475216941289cf062e05ca9c75e0f
 2014-10-24 11:36:46 +01:00
Joe Fernandez
90f734eb18 am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
* commit '0e893eb7ac1985a02d61525a5e6076d45a1e8c7d':
  docs:Added 64-bit image note from Preview page
 2014-10-24 09:27:02 +00:00
Narayan Kamath
e572a77f05 am fa36b36c: Merge "Deprecate more apache-http." into lmp-mr1-dev 
* commit 'fa36b36c8b66fc89f446a9eb065c31a1b224e662':
  Deprecate more apache-http.
 2014-10-24 09:13:22 +00:00
Narayan Kamath
2f3483939e am 7eafd944: Merge "Deprecate apache-http." into lmp-mr1-dev 
* commit '7eafd944cd5845001a0b2562f55685832d8023f3':
  Deprecate apache-http.
 2014-10-24 09:13:17 +00:00
Yuncheol Heo
ddb863f428 am 5b062e07: Merge "CEC: Fix apilint errors." into lmp-mr1-dev 
* commit '5b062e07c5a647d12cbeb9dace7806b54d459c56':
  CEC: Fix apilint errors.
 2014-10-24 09:13:14 +00:00
Neil Fuller
12260ad72c am 07ff2f72: Merge "Deprecating FloatMath and Time" into lmp-mr1-dev 
* commit '07ff2f72c8ae14415d784ddeb3944c5a9b188a83':
  Deprecating FloatMath and Time
 2014-10-24 09:13:09 +00:00
Narayan Kamath
fa36b36c8b Merge "Deprecate more apache-http." into lmp-mr1-dev 2014-10-24 08:58:45 +00:00
Narayan Kamath
7eafd944cd Merge "Deprecate apache-http." into lmp-mr1-dev 2014-10-24 08:56:56 +00:00
Yuncheol Heo
5b062e07c5 Merge "CEC: Fix apilint errors." into lmp-mr1-dev 2014-10-24 08:48:30 +00:00
Natalie Masse
bcf9ced47a am 1e5bb861: Link and typo fixed 
* commit '1e5bb861265072b9af555d09202e49cb38a3c4f1':
  Link and typo fixed
 2014-10-24 08:13:36 +00:00
Neil Fuller
07ff2f72c8 Merge "Deprecating FloatMath and Time" into lmp-mr1-dev 2014-10-24 08:10:39 +00:00