154556 Commits

Author SHA1 Message Date
Dan Albert
6800165351 resolved conflicts for merge of 1d99636f to lmp-dev-plus-aosp
Change-Id: Ic5f808de7d9722056112c6a73c718892e00bc9df
2014-09-09 09:51:01 -07:00
Dan Albert
1d99636fcc am 8085477f: Merge "Don\'t check for null references."
* commit '8085477fb98eab36bbc8c3e9add76f398235b469':
  Don't check for null references.
2014-09-09 16:35:02 +00:00
Dan Albert
8085477fb9 Merge "Don't check for null references." 2014-09-09 16:25:41 +00:00
Jorim Jaggi
08dceea7d3 am c6fed35c: am bc6542cc: Merge "Remove a few unnecessary withLayer() calls" into lmp-dev
* commit 'c6fed35cf4c2f260025c03b26f8be785afad42ee':
  Remove a few unnecessary withLayer() calls
2014-09-09 16:07:58 +00:00
Jorim Jaggi
540e3d6f46 am c02c525d: am 71d150d2: Merge "Fix padding between R and wifi icon" into lmp-dev
* commit 'c02c525d90f298dcd8cadc29f88f99ee8afa97d7':
  Fix padding between R and wifi icon
2014-09-09 16:07:53 +00:00
Jorim Jaggi
ef646ea250 am bc6542cc: Merge "Remove a few unnecessary withLayer() calls" into lmp-dev
* commit 'bc6542cca228440c6ca29fe038a2cf98e1b47fd5':
  Remove a few unnecessary withLayer() calls
2014-09-09 15:57:27 +00:00
Jorim Jaggi
1dae3cf327 am 71d150d2: Merge "Fix padding between R and wifi icon" into lmp-dev
* commit '71d150d2549277f664f69aada6cd08022e984a5e':
  Fix padding between R and wifi icon
2014-09-09 15:57:22 +00:00
Selim Cinek
0dc069647c am 20dd36fe: am edf8bc9b: Merge "Fixed a bug that the icon was not animating anymore when updating." into lmp-dev
* commit '20dd36fe15044d0b339a98bc8d79e4d53f645ef5':
  Fixed a bug that the icon was not animating anymore when updating.
2014-09-09 15:51:57 +00:00
Selim Cinek
8cb36007f4 am 30dcddf1: am 9e58d85f: Merge "Properly announcing HUN state for talkback" into lmp-dev
* commit '30dcddf15b99874431053cd9720803566b0d4f10':
  Properly announcing HUN state for talkback
2014-09-09 15:51:52 +00:00
Selim Cinek
56f348a6a8 am 41f7116b: am f844d519: Merge "Avoiding heads-up when accessibility is turned on" into lmp-dev
* commit '41f7116befe0f92496185970ad97cabcea3cc476':
  Avoiding heads-up when accessibility is turned on
2014-09-09 15:51:47 +00:00
Jorim Jaggi
fbc3f1984a Merge "Remove a few unnecessary withLayer() calls" into lmp-dev 2014-09-09 15:51:18 +00:00
Jorim Jaggi
f832638b57 Merge "Fix padding between R and wifi icon" into lmp-dev 2014-09-09 15:49:08 +00:00
Selim Cinek
9c3e790b0a am edf8bc9b: Merge "Fixed a bug that the icon was not animating anymore when updating." into lmp-dev
* commit 'edf8bc9bf91f3883c1ea21a915a68c9cc9e944cf':
  Fixed a bug that the icon was not animating anymore when updating.
2014-09-09 15:41:46 +00:00
Selim Cinek
5a4db42a92 am 9e58d85f: Merge "Properly announcing HUN state for talkback" into lmp-dev
* commit '9e58d85fa52ec0f6f76924bf81003cb6dbfce7c8':
  Properly announcing HUN state for talkback
2014-09-09 15:41:41 +00:00
Selim Cinek
0f47ca7a22 am f844d519: Merge "Avoiding heads-up when accessibility is turned on" into lmp-dev
* commit 'f844d5193d7199118648d6181519b2329be78be7':
  Avoiding heads-up when accessibility is turned on
2014-09-09 15:41:37 +00:00
Selim Cinek
a9dddfb011 Merge "Fixed a bug that the icon was not animating anymore when updating." into lmp-dev 2014-09-09 15:35:07 +00:00
Selim Cinek
2d12d98303 Merge "Properly announcing HUN state for talkback" into lmp-dev 2014-09-09 15:34:45 +00:00
Selim Cinek
f219dad7e5 Merge "Avoiding heads-up when accessibility is turned on" into lmp-dev 2014-09-09 15:34:07 +00:00
Jorim Jaggi
6107a10ca5 Remove a few unnecessary withLayer() calls
Fixes some jank.

Bug: 17287256
Change-Id: I6c518f12decffa0d3a180499a92823b35e2dd4d5
2014-09-09 17:23:29 +02:00
Jorim Jaggi
c737b9bd5a Fix padding between R and wifi icon
Also adds some padding for the type and the signal strength icon in
LTE, 3G, 4G and 1x case.

Bug: 17421452

Change-Id: Ib3e6d2983397833958bca1fd33eb8b8c69e7c7fd
2014-09-09 16:35:17 +02:00
Selim Cinek
51ae05d920 Fixed a bug that the icon was not animating anymore when updating.
Bug: 16043845
Change-Id: I0cdb1ee5ddefd4404cd9a6cab61baf1b281a457b
2014-09-09 16:35:08 +02:00
Jorim Jaggi
2705076051 am 4bf67d15: am bd8dc855: Merge "Do not dim the non-activated notifications on lockscreen" into lmp-dev
* commit '4bf67d151124a2e4974f4cdbc0fdc83a26e50771':
  Do not dim the non-activated notifications on lockscreen
2014-09-09 14:22:08 +00:00
Jorim Jaggi
37c2e463c3 am bd8dc855: Merge "Do not dim the non-activated notifications on lockscreen" into lmp-dev
* commit 'bd8dc855708bc04eb322212aad7dc74a385aed25':
  Do not dim the non-activated notifications on lockscreen
2014-09-09 14:11:56 +00:00
Jorim Jaggi
33b5f783af Merge "Do not dim the non-activated notifications on lockscreen" into lmp-dev 2014-09-09 14:01:24 +00:00
Jorim Jaggi
4538cee46d Do not dim the non-activated notifications on lockscreen
This fixes a lot of jank when showing all cards by tapping the more
card, because this lead to layer trashing in every frame (the
background was updated as well as the overall alpha for the card).

Bug: 17419967
Change-Id: Ib39af6eaab26409eedff72c921e9aa1ede31b830
2014-09-09 15:51:39 +02:00
Jorim Jaggi
3d6de24ad3 am df3e76a9: am cc597c82: Merge "Apply color to auto-redacted notification" into lmp-dev
* commit 'df3e76a95df9f2f8c0192584986b21f2f68217d4':
  Apply color to auto-redacted notification
2014-09-09 12:16:59 +00:00
Jorim Jaggi
35ddabfd86 am cc597c82: Merge "Apply color to auto-redacted notification" into lmp-dev
* commit 'cc597c82009d1a30e064798b0820be593d7e3bfa':
  Apply color to auto-redacted notification
2014-09-09 12:07:08 +00:00
Jorim Jaggi
e51d6a3aec Merge "Apply color to auto-redacted notification" into lmp-dev 2014-09-09 12:01:32 +00:00
Zoltan Szatmary-Ban
1dbd4b6646 am 52847478: am 1bb79472: Merge "Extend IKeyChainService AIDL with CACert retrieval" into lmp-dev
* commit '52847478b208d8fed1d8b0d191b080b411f3df8b':
  Extend IKeyChainService AIDL with CACert retrieval
2014-09-09 11:18:10 +00:00
Paul Jensen
7f7e0b07a7 am d40b08f4: am 2ea21f45: Merge "Stop logging false error when lingering completes." into lmp-dev
* commit 'd40b08f44a77e5fd4779d532492d902bdd7b8c1f':
  Stop logging false error when lingering completes.
2014-09-09 11:18:05 +00:00
Paul Jensen
3c745386f0 am 12610b50: am 61892299: Merge "Don\'t send listening NetworkRequests to NetworkFactories." into lmp-dev
* commit '12610b501956772e697f04a152fe617a31a9d1e0':
  Don't send listening NetworkRequests to NetworkFactories.
2014-09-09 11:18:00 +00:00
Paul Jensen
551cb38e95 am 035010e5: am 6801c1b7: Merge "Implement ConnectivityManager.reportBadNetwork() to trigger network validation." into lmp-dev
* commit '035010e5975f0f4b70cfc4361c622dc2685b0ce2':
  Implement ConnectivityManager.reportBadNetwork() to trigger network validation.
2014-09-09 11:17:55 +00:00
Zoltan Szatmary-Ban
b5d5435869 am 1bb79472: Merge "Extend IKeyChainService AIDL with CACert retrieval" into lmp-dev
* commit '1bb79472882f5926606713f8b8ddf2e82128051e':
  Extend IKeyChainService AIDL with CACert retrieval
2014-09-09 11:08:05 +00:00
Paul Jensen
958031132e am 2ea21f45: Merge "Stop logging false error when lingering completes." into lmp-dev
* commit '2ea21f45fcf932f6b63fdda38019092892acfa06':
  Stop logging false error when lingering completes.
2014-09-09 11:08:00 +00:00
Paul Jensen
64b880a060 am 61892299: Merge "Don\'t send listening NetworkRequests to NetworkFactories." into lmp-dev
* commit '618922999271c8d2b1399f348d8780eaf230c272':
  Don't send listening NetworkRequests to NetworkFactories.
2014-09-09 11:07:55 +00:00
Paul Jensen
0e5293ae88 am 6801c1b7: Merge "Implement ConnectivityManager.reportBadNetwork() to trigger network validation." into lmp-dev
* commit '6801c1b710eb7d1cbd3411abe0ef7a6cc7fd476a':
  Implement ConnectivityManager.reportBadNetwork() to trigger network validation.
2014-09-09 11:07:50 +00:00
Zoltan Szatmary-Ban
1d38f58990 Merge "Extend IKeyChainService AIDL with CACert retrieval" into lmp-dev 2014-09-09 11:05:45 +00:00
Paul Jensen
eea87a3a44 Merge "Stop logging false error when lingering completes." into lmp-dev 2014-09-09 10:59:42 +00:00
Paul Jensen
fc2c5c9199 Merge "Don't send listening NetworkRequests to NetworkFactories." into lmp-dev 2014-09-09 10:59:20 +00:00
Paul Jensen
f9b42de2ab Merge "Implement ConnectivityManager.reportBadNetwork() to trigger network validation." into lmp-dev 2014-09-09 10:58:59 +00:00
Selim Cinek
063e1b50b7 am dc6d75d6: am 71f55d23: Merge "Announcing the stream type when the volume panel comes up" into lmp-dev
* commit 'dc6d75d6312986af4080f31c221c0dcb074fa19e':
  Announcing the stream type when the volume panel comes up
2014-09-09 10:42:10 +00:00
Selim Cinek
7015a9b88e am a5499118: am b9a2c1f7: Merge "Fixed a bug with the anti-falsing logic with dismissing" into lmp-dev
* commit 'a549911831394425fdc64a94eb470bfc6edbbaab':
  Fixed a bug with the anti-falsing logic with dismissing
2014-09-09 10:42:05 +00:00
Selim Cinek
be6767f956 am 71f55d23: Merge "Announcing the stream type when the volume panel comes up" into lmp-dev
* commit '71f55d233f24fe3443ca369444afce9087a6f3c2':
  Announcing the stream type when the volume panel comes up
2014-09-09 10:33:18 +00:00
Selim Cinek
2e5b44ccf3 am b9a2c1f7: Merge "Fixed a bug with the anti-falsing logic with dismissing" into lmp-dev
* commit 'b9a2c1f7522bd24fed3234081a9b8c7b797272f8':
  Fixed a bug with the anti-falsing logic with dismissing
2014-09-09 10:33:13 +00:00
Selim Cinek
5276a772ce Properly announcing HUN state for talkback
Bug: 17067870
Bug: 16652871
Change-Id: I5d33166eaab31e3ac58d75653c0f80fab23718c2
2014-09-09 12:27:50 +02:00
Selim Cinek
a8fefa54bd Avoiding heads-up when accessibility is turned on
Bug: 16017019
Change-Id: I08ec75e6b3296eefb9ae5e8fdc9f8dd6c4ad4816
2014-09-09 12:27:27 +02:00
Selim Cinek
5da328beb2 Merge "Announcing the stream type when the volume panel comes up" into lmp-dev 2014-09-09 10:24:45 +00:00
Selim Cinek
0110c57f92 Merge "Fixed a bug with the anti-falsing logic with dismissing" into lmp-dev 2014-09-09 10:23:45 +00:00
Nicolas Prevot
d4ca8a19dd am bed59864: am 7d1d9f77: Merge "Allowing a ContentProvider to have a null authority." into lmp-dev
* commit 'bed598649b9eeae6d0112477113bb3904314a10e':
  Allowing a ContentProvider to have a null authority.
2014-09-09 09:29:19 +00:00
Nicolas Prevot
442c275bf6 am 7d1d9f77: Merge "Allowing a ContentProvider to have a null authority." into lmp-dev
* commit '7d1d9f774203522c98f65a3e3dceb9dc88be2129':
  Allowing a ContentProvider to have a null authority.
2014-09-09 09:18:22 +00:00