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

8258 Commits

Author SHA1 Message Date
Jorim Jaggi
8f72e8967b Merge "NotificationRowLayout shall rest in its grave." 2014-04-30 13:53:02 +00:00
Jorim Jaggi
59c77fee17 NotificationRowLayout shall rest in its grave. 
Long live the stack scroller. Also removed some other unused classes.

Change-Id: Iff126a0e74e13caadb6426d5e0e76ba800489d3f
 2014-04-30 15:45:25 +02:00
Jorim Jaggi
65e4a4ee30 am ed8b4ca0: Merge "Layout notifications on top and introduce artifical margin" 
* commit 'ed8b4ca093d8aba40d29ef7ad701b28f8c313d97':
  Layout notifications on top and introduce artifical margin
 2014-04-30 13:31:27 +00:00
Jorim Jaggi
8c1a44b62f Layout notifications on top and introduce artifical margin 
This allows for animating the notifications between the different
states. So we can nicely switch between Keyguard and full shade,
and make the stack smaller when going to quick settings.

Change-Id: I768dc7cd8f4dc0197365a5befebad24086816a8d
 2014-04-30 15:25:56 +02:00
Michael Wright
1e67bcec50 am 263c36a1: am ade631ee: Merge "NULL previous background bitmap upon changing wallpaper" 
* commit '263c36a144a66d30dd51abd7ca0120480e449aa5':
  NULL previous background bitmap upon changing wallpaper
 2014-04-30 01:24:32 +00:00
Michael Wright
263c36a144 am ade631ee: Merge "NULL previous background bitmap upon changing wallpaper" 
* commit 'ade631eed0df228e343f2a00db653058ff588846':
  NULL previous background bitmap upon changing wallpaper
 2014-04-30 01:22:05 +00:00
Michael Wright
bba434af67 am 10884694: am 357c75e7: Merge "Add missing character combinations for international layouts" 
* commit '108846942f4296fa12b09dd70d60a21c69deace2':
  Add missing character combinations for international layouts
 2014-04-30 01:19:56 +00:00
Michael Wright
ade631eed0 Merge "NULL previous background bitmap upon changing wallpaper" 2014-04-30 01:19:10 +00:00
Michael Wright
108846942f am 357c75e7: Merge "Add missing character combinations for international layouts" 
* commit '357c75e74760933f05ff89352ee86dd540633782':
  Add missing character combinations for international layouts
 2014-04-30 00:07:11 +00:00
Bill Yi
293513a59d Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD 2014-04-29 16:07:29 -07:00
Selim Cinek
3861e22805 am 011dee6f: Merge "Introduced basic animations for the new notifications." 
* commit '011dee6f7c1990305ab3db223d507a814a1b59c8':
  Introduced basic animations for the new notifications.
 2014-04-29 22:05:47 +00:00
Selim Cinek
0377b796d0 Merge "Introduced basic animations for the new notifications." 2014-04-29 22:03:17 +00:00
Selim Cinek
572bbd42a4 Introduced basic animations for the new notifications. 
Animations between two different states of the notification stack scroller
are now possible.

Bug: 14081264
Change-Id: I2b8e964095f71766feac5a76c4e3b85d22648d35
 2014-04-30 00:01:06 +02:00
Jorim Jaggi
b50f068cdd am 20bede37: Merge "Prevent expanded notifications on lockscreen." 
* commit '20bede37cd3f97704b6c91c13694a3413f33a75d':
  Prevent expanded notifications on lockscreen.
 2014-04-29 21:26:04 +00:00
Jorim Jaggi
9f5957989e Merge "Prevent expanded notifications on lockscreen." 2014-04-29 21:23:03 +00:00
Jorim Jaggi
dce3c4cca5 Prevent expanded notifications on lockscreen. 
Change-Id: I9a0ffca823883cfed75d0e093f5a4364b20008b3
 2014-04-29 23:20:12 +02:00
Baligh Uddin
d1cf53e002 Merge "Import translations. DO NOT MERGE" 2014-04-29 21:02:37 +00:00
Baligh Uddin
b2776bf7a4 Merge "Import translations. DO NOT MERGE" 2014-04-29 21:02:32 +00:00
Jorim Jaggi
1677cfd31a am e4a7b5ef: Merge "Remove "speedbump" to expand notification with one finger." 
* commit 'e4a7b5ef24e2ccd5d37497b56555f123ee4c5d50':
  Remove "speedbump" to expand notification with one finger.
 2014-04-29 20:58:31 +00:00
Jorim Jaggi
707eb8bab9 Merge "Remove "speedbump" to expand notification with one finger." 2014-04-29 20:52:34 +00:00
Selim Cinek
61168c7162 am 80284e2e: Merge "Refactored the layout of a notifications" 
* commit '80284e2e40f28cad1315f57388db999f69edd972':
  Refactored the layout of a notifications
 2014-04-29 20:50:03 +00:00
Jorim Jaggi
7f2d87c006 Remove "speedbump" to expand notification with one finger. 
Change-Id: I16b2493142adc277a3cb11ab9a88040aab6e3f47
 2014-04-29 22:49:48 +02:00
Selim Cinek
d0b12fe4a2 Merge "Refactored the layout of a notifications" 2014-04-29 20:46:12 +00:00
Jorim Jaggi
be565dfc1c Refactored the layout of a notifications 
Notifications now consist of ExpandableViews instead of SizeAdaptiveLayouts
to avoid layout passes during the resizing. The StackScrollAlgorithm and its
States are also refactored in order to support the new behaviour. In addition,
the generation of the outline is moved to the notification views instead of
the container which contains them.

Change-Id: I1ac1292a6520f5951610039bfa204c204be9d640
 2014-04-29 22:42:55 +02:00
John Spurlock
f43d8237c8 am a5f51006: Merge "Subscribe to default zen mode condition." 
* commit 'a5f510061a0dc9bdf8d0de4f1faf1441ef5564f0':
  Subscribe to default zen mode condition.
 2014-04-29 20:39:10 +00:00
John Spurlock
dbb22bcd3f Subscribe to default zen mode condition. 
Otherwise re-opening the current QS panel does not force an unsubscribe
(if a non-default condition was subscribed).

Change-Id: I1ec2519cc051d435c2ebbe8cea4a9b54f256820d
 2014-04-29 16:31:13 -04:00
Mathieu Meisser
04f8532776 Add missing character combinations for international layouts 
Czech: add missing capslock for numbers and shift+ralt
mappings.
Slovak: fix wrong ralt mappings, add missing ralt mappings
and fixed wrong PLUS key character.
US intl: add missing capslock+ralt support.
Swiss French and Swiss German: add missing ralt mapping for key
numbers 4 and 5, and add missing capslock and capslock+
shift for SEMICOLON and APOSTROPHE.

Change-Id: I02c94bf13d5268d5d1e648c96b7251cb7564f233
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
 2014-04-29 16:52:40 +02:00
Elliott Hughes
d9e6101862 am 05678e17: resolved conflicts for merge of 3ce4f3d0 to master 
* commit '05678e17e8c079a1c1c144e23e40a7a644a0b040':
  Track libcore.os' move to android.system.
 2014-04-28 21:22:01 +00:00
Elliott Hughes
10596fbcce resolved conflicts for merge of 3ce4f3d0 to master 
Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
 2014-04-28 13:53:25 -07:00
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
Elliott Hughes
3ce4f3d0af am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system." 
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.
 2014-04-28 18:36:53 +00: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
Elliott Hughes
34385d352d Track libcore.os' move to android.system. 
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
 2014-04-28 11:11:32 -07:00
Baligh Uddin
94b6f73368 Import translations. DO NOT MERGE 
Change-Id: Ie48d7eaf59819fac2bcdc2a6d8a706a3bfa3c6dd
Auto-generated-cl: translation import
 2014-04-28 10:34:23 -07:00
Baligh Uddin
9b0e267f4c Import translations. DO NOT MERGE 
Change-Id: I0759dcb477375df5e96160003f421821fb5ba371
Auto-generated-cl: translation import
 2014-04-28 10:27:17 -07: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
Stefan Wysocki
22d3990273 Set ActionMode title to the number of selected files 
After change of orientation ActionMode is recreated without previously
set title. It needs to be updated in onCreateActionMode callback.

Change-Id: If5f36e8ad6d1b5cf04ed242611fd037969d73517
 2014-04-28 10:47:34 +02: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