Commit Graph

4447 Commits

Author SHA1 Message Date
Jorim Jaggi
4e723047bc am 767c0116: Merge "Attemp to fix blank lockscreen #2."
* commit '767c01161ad4c18bf476e224a93345a7e8a02746':
  Attemp to fix blank lockscreen #2.
2014-04-28 20:37:59 +00:00
Jorim Jaggi
3ab060efc3 am 8ffdb68e: Merge "Flatten notification hiearchy and remove glow."
* commit '8ffdb68e112bf1f949eec56800275beceae7fadc':
  Flatten notification hiearchy and remove glow.
2014-04-28 20:37:55 +00:00
Selim Cinek
9cc14ad1c8 am 2f3847bf: Merge "Fixed race condition regarding first child max height"
* commit '2f3847bf83aef4eee1b7e3b3ea16bb106accb43b':
  Fixed race condition regarding first child max height
2014-04-28 20:37:37 +00:00
Jorim Jaggi
10c84f0109 Merge "Attemp to fix blank lockscreen #2." 2014-04-28 19:08:41 +00:00
Jorim Jaggi
fa505a7f26 Attemp to fix blank lockscreen #2.
Bug: 14280857
Change-Id: Ib868cc7a01d24f7169310774a5397b90a2d5b35f
2014-04-28 21:06:37 +02:00
Jorim Jaggi
d3406d7a1a Merge "Flatten notification hiearchy and remove glow." 2014-04-28 19:01:14 +00:00
Jorim Jaggi
fe40f7d13b Flatten notification hiearchy and remove glow.
Currently, the padding and the glow was inside the individual
notification. This no longer works if we want to adjust the
padding dynamically whether we are on Keyguard or not. This change
moves the padding outside of the individual notifications, and as
a side effect, removes the glow. The glow wasn't really visible with
the new layout, so it's not a breaking change. We have to discuss
with UX first what the new "glow" solution is going to be.

Change-Id: Iac16892cb3b7bb1de3001954b1428796b07950c1
2014-04-28 20:59:26 +02:00
Selim Cinek
622e32bb6a Merge "Fixed race condition regarding first child max height" 2014-04-28 18:28:32 +00:00
Selim Cinek
2ba5f1f4e3 Fixed race condition regarding first child max height
The scroller could crash due to a race condition when updating
the maxheight of the first view.

Bug: 14295010
Change-Id: I911c724a26c8624e2326118e3b392ee675001bc6
2014-04-28 20:27:32 +02:00
Dan Sandler
7e4a36c34a am cf26a842: Merge "Remove chatty log message."
* commit 'cf26a8426285674d2c2f293762c489faeba3f775':
  Remove chatty log message.
2014-04-28 15:04:30 +00:00
Dan Sandler
f0ef1e9987 Merge "Remove chatty log message." 2014-04-28 14:59:33 +00:00
Jorim Jaggi
46da668b13 am 3daa96f4: Merge "Add carrier text on lockscreen in top left corner."
* commit '3daa96f406d2cb46b55d71c696ce81656a7a2682':
  Add carrier text on lockscreen in top left corner.
2014-04-28 12:21:57 +00:00
Jorim Jaggi
b039603867 Merge "Add carrier text on lockscreen in top left corner." 2014-04-28 12:18:44 +00:00
John Spurlock
4210a3091c am c1644c59: Wire up condition providers to zen mode exit triggers.
* commit 'c1644c590bbc24955ecd367cb4c8e368c24fe2e5':
  Wire up condition providers to zen mode exit triggers.
2014-04-27 16:04:22 +00:00
John Spurlock
e77bb36d48 Wire up condition providers to zen mode exit triggers.
Bug:13743109
Change-Id: I4e45d7050d1f9aaa379f46379a3203e61e216a3d
2014-04-27 11:36:32 -04:00
Wink Saville
994a9a39b5 am e9c9547e: am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit 'e9c9547e899a7095f3fb420df7d4d809ab13ea57':
  Telephony: Add functionality to handle ICC IO error
2014-04-26 00:35:49 +00:00
Wink Saville
ae166fe9e0 am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit 'c79963c3cb6d0127e2fc9ce5bf000fa05811504d':
  Telephony: Add functionality to handle ICC IO error
2014-04-26 00:28:56 +00:00
Wink Saville
c79963c3cb am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit '1c1827a6402c3a1f38ba077289a9022f6e6d3f73':
  Telephony: Add functionality to handle ICC IO error
2014-04-26 00:25:44 +00:00
Wink Saville
3f4867f49d Merge "Telephony: Add functionality to handle ICC IO error" 2014-04-25 23:58:11 +00:00
John Spurlock
96e358e777 am f85cfcf4: Merge "Delay settings panel visibility until touch slop exceeded."
* commit 'f85cfcf4c0ab813b6694a3cc88a20e9ca7e100af':
  Delay settings panel visibility until touch slop exceeded.
2014-04-25 18:56:40 +00:00
John Spurlock
47ffde252e Merge "Delay settings panel visibility until touch slop exceeded." 2014-04-25 18:53:16 +00:00
John Spurlock
4e9d7c1797 Delay settings panel visibility until touch slop exceeded.
Bug:14271219
Change-Id: Ic8f36670f8d56f74a383ca7a867b69c7568a7250
2014-04-25 12:18:46 -04:00
Jorim Jaggi
e8bd50b00c am 1578e08d: Merge "Attempt to fix blank lockscreen."
* commit '1578e08db4db31faf0b44a948c93f9992077c131':
  Attempt to fix blank lockscreen.
2014-04-25 16:18:02 +00:00
Winson Chung
0aed0dd40a am 67b082e0: Merge "Enabling doc centric recents on phones."
* commit '67b082e02cbfb7bafe046a619e686e9a5c1abc05':
  Enabling doc centric recents on phones.
2014-04-25 16:08:17 +00:00
Jorim Jaggi
bea6990e64 am fb2b6bc6: Merge "Add text view for double-tap and unlock hint on Keyguard."
* commit 'fb2b6bc62d54a6abdc2ec61c2299e060b6ae6671':
  Add text view for double-tap and unlock hint on Keyguard.
2014-04-25 15:52:20 +00:00
Jorim Jaggi
1578e08db4 Merge "Attempt to fix blank lockscreen." 2014-04-25 13:13:12 +00:00
Jorim Jaggi
c357ca2013 Attempt to fix blank lockscreen.
Bug: 14280857
Change-Id: Icf458040b1a0b0a412981acf7b522d04c046a5f8
2014-04-25 14:56:15 +02:00
Jorim Jaggi
25807936e8 Add carrier text on lockscreen in top left corner.
Change-Id: I88c96eabc4b97295da5c1094db3fd22fcc637390
2014-04-25 14:18:07 +02:00
Winson Chung
67b082e02c Merge "Enabling doc centric recents on phones." 2014-04-24 23:24:40 +00:00
Jorim Jaggi
fb2b6bc62d Merge "Add text view for double-tap and unlock hint on Keyguard." 2014-04-24 20:34:30 +00:00
Jorim Jaggi
e70d31f48d Add text view for double-tap and unlock hint on Keyguard.
Bug: 14080971
Change-Id: Id6f7344b01bb9666fe6add415ec4a28163315967
2014-04-24 22:08:30 +02:00
Dan Sandler
f68448ef61 Remove chatty log message.
Change-Id: If0acc3be413d86c87a2a8c68fdcf94bada7e0903
2014-04-24 15:54:16 -04:00
Baligh Uddin
9ea712006d Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:12 +00:00
Winson Chung
d937bb24b8 am 628f8966: Merge "Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)"
* commit '628f89667410f8c1d7e8892292aa36634f3e3384':
  Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)
2014-04-24 00:27:28 +00:00
Amith Yamasani
d33a3be7d1 am 5451c559: Merge "Don\'t show managed profiles in the user switcher"
* commit '5451c559ecd3ac45e3d4dfc5838cb1996404116d':
  Don't show managed profiles in the user switcher
2014-04-24 00:27:19 +00:00
Winson Chung
628f896674 Merge "Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)" 2014-04-24 00:14:03 +00:00
Winson Chung
80693f9fb5 Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)
- Fixing issue with wrong margins due to moved activity icon

Change-Id: Ib3631dc4cf4244d44737ee95b597bd25653815c8
2014-04-23 16:48:33 -07:00
Amith Yamasani
921b71e95f Don't show managed profiles in the user switcher
Only show users that you can switch to.

Change-Id: Iff6dfccc27230f824d73d02731a045c69419b814
2014-04-23 14:43:23 -07:00
John Spurlock
6f1b54e455 am 7f2ffe4f: Merge "Avoid panel "flip" animations when possible."
* commit '7f2ffe4fe1daf8a986bd9a6027973dc72145a432':
  Avoid panel "flip" animations when possible.
2014-04-23 20:38:17 +00:00
John Spurlock
17880ef81f Avoid panel "flip" animations when possible.
Bug:14271219
Change-Id: I91632c073497718e2fd53ad172ec805f54514696
2014-04-23 16:13:56 -04:00
Baligh Uddin
07f14e11a1 Import translations. DO NOT MERGE
Change-Id: Id3aec0b4534311c2ca89dcf86e04566c0cf025c3
Auto-generated-cl: translation import
2014-04-23 12:16:20 -07:00
John Spurlock
2550e9e6b8 am 4e8cf150: Merge "Quick settings: interim tile shuffle."
* commit '4e8cf1508f22f88203cd9bf4467aaddd3f4502c6':
  Quick settings: interim tile shuffle.
2014-04-23 17:50:37 +00:00
John Spurlock
4e8cf1508f Merge "Quick settings: interim tile shuffle." 2014-04-23 17:46:45 +00:00
John Spurlock
0f407279ff Quick settings: interim tile shuffle.
Ensure BT and location appear in 3x3 mode, by:
 - Adding the three conditional accessibility tiles at the end
 - Moving BT and location above airplane mode (available via global actions)
   and zen mode (sorry).

Bug:14162372
Change-Id: I6d79a7442f091d58643c5124cfe0dcbf6e3cd46f
2014-04-23 13:22:59 -04:00
Jorim Jaggi
1083139ad7 am e84d544f: Merge "Move redaction logic showing from Keyguard to PhoneStatusBar."
* commit 'e84d544fe4b238efc408280ec7e01f9c3f04a1b6':
  Move redaction logic showing from Keyguard to PhoneStatusBar.
2014-04-23 16:28:27 +00:00
Jorim Jaggi
e84d544fe4 Merge "Move redaction logic showing from Keyguard to PhoneStatusBar." 2014-04-23 16:24:04 +00:00
Selim Cinek
62608dadb0 am b6e0e122: Fixed a bug where holes could occur in the new shade.
* commit 'b6e0e1228bfd38f5ba971194afc5c31d99980fa1':
  Fixed a bug where holes could occur in the new shade.
2014-04-23 16:10:55 +00:00
Selim Cinek
b6e0e1228b Fixed a bug where holes could occur in the new shade.
When a notification was never layouted before and it was the first
child, holes could occur in the shade when dragging down, because its
maximum allowed height was wrongly calculated.

Bug: 14080722
Change-Id: Ia10f9dd95f917d492411aec1da4ae0fc4d8f33d5
2014-04-23 17:50:48 +02:00
Jorim Jaggi
1568250853 Move redaction logic showing from Keyguard to PhoneStatusBar.
This removes a race condition and makes redaction more stable.

Change-Id: I4084cdf490c0e52fe26f45cb00524e0876a068bc
2014-04-23 17:02:25 +02:00
Dan Sandler
df7b8c7c25 am c3be4506: Merge "Avoid sending broadcasts before BOOT_COMPLETED."
* commit 'c3be45064863003d11387b2456c6957bc86d2fd2':
  Avoid sending broadcasts before BOOT_COMPLETED.
2014-04-22 18:56:30 +00:00