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

8782 Commits

Author SHA1 Message Date
Jerome Poichet
7fc1e22150 am 576563c3: Merge "Using Manufacturer and not brand for device name" into lmp-preview-dev 
* commit '576563c3d37ba58bc94e87aa385d92dc79498003':
  Using Manufacturer and not brand for device name
 2014-06-09 19:29:23 +00:00
Dan Sandler
0d99a507b2 am 6e73d4a9: Fix mangled XML. 
* commit '6e73d4a9d9d1031d302a7e1f21939c9239c0549d':
  Fix mangled XML.
 2014-06-09 19:29:08 +00:00
Dan Sandler
f730eab54c am d8349135: Pour one out for the old notification ticker. 
* commit 'd8349135a3189d4d4fd4180b0bffd2a987d4379d':
  Pour one out for the old notification ticker.
 2014-06-09 19:29:02 +00:00
Jerome Poichet
cbe8e35bda Merge "Using Manufacturer and not brand for device name" into lmp-preview-dev 2014-06-09 18:42:20 +00:00
Dan Sandler
19dba9a37d Fix mangled XML. 
Bug: 14588447
Change-Id: I95b46952dcba65cb71d8d28635f92554a1a128b7
 2014-06-09 17:02:50 +00:00
Dan Sandler
44c0dfd52f Pour one out for the old notification ticker. 
Heads-up notifications are what it always wanted to be,
anyway.

Bug: 14588447
Change-Id: I64aa1ed85fb162d8577468019e68df9de183a992
 2014-06-09 16:55:02 +00:00
Jerome Poichet
efc3c465cf Using Manufacturer and not brand for device name 
We are aware that there will be some devices out there using brand but
we are OK with this.

b/15478133 Build.MANUFACTURER is all lower case

Change-Id: Iecf8bc8777f21341abfaad1623c9da93ee159520
 2014-06-08 21:50:46 -07:00
Baligh Uddin
069f94230d Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:55 +00:00
Baligh Uddin
48798325ed Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:51 +00:00
Baligh Uddin
ceb997bae0 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-07 03:10:45 +00:00
Baligh Uddin
714ac2891c Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:42 +00:00
Baligh Uddin
c525c9605f Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:29 +00:00
Baligh Uddin
d5cf4a6ff6 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-07 03:10:23 +00:00
Baligh Uddin
e70fea28e6 Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:20 +00:00
Alan Viverette
830960cce0 Material theme 
BUG: 15467097
Change-Id: I15191362e104a902895418fc615892c21db64c35
 2014-06-06 15:48:55 -07:00
Alan Viverette
3cb07a462b DO NOT MERGE Material theme 
BUG: 15467097
Change-Id: I15191362e104a902895418fc615892c21db64c35
 2014-06-06 14:19:53 -07:00
Svetoslav
bb1b857841 Merge "Refactor printing" 2014-06-06 20:36:50 +00:00
Svetoslav
a798c0a984 Refactor printing 
Change-Id: I19850154ef2798afff511e4490a268ce38e8cbae
 2014-06-06 13:33:16 -07:00
Selim Cinek
45ec647301 am b5de5c5e: Merge "When dragging down on the lockscreen, the lowest card could jump." into lmp-preview-dev 
* commit 'b5de5c5eae5acf879314610a17c1c9950948782d':
  When dragging down on the lockscreen, the lowest card could jump.
 2014-06-06 18:25:58 +00:00
Dan Sandler
cb17c5e188 am e45ddb40: Merge "Always hide status bar icons when status bar is expanded" into lmp-preview-dev 
* commit 'e45ddb4008b3c217b59bc4ded61aea3caf2341eb':
  Always hide status bar icons when status bar is expanded
 2014-06-06 18:25:48 +00:00
Selim Cinek
ece9de4466 Merge "When dragging down on the lockscreen, the lowest card could jump." into lmp-preview-dev 2014-06-06 16:15:52 +00:00
Selim Cinek
aef92efb10 When dragging down on the lockscreen, the lowest card could jump. 
Bug: 15203895
Change-Id: I1a0a5a236490f12dba93700685be049d723b5339
 2014-06-06 18:06:04 +02:00
Jorim Jaggi
b13d36d428 Always hide status bar icons when status bar is expanded 
Also improve the animation when expanding/collapsing the shade for
a jank-free alpha fade animation.

Bug: 15448443
Bug: 15407838
Change-Id: Ieb0ce6d5bb1e5c1fb60d433b6989c52ec6924e8c
 2014-06-06 18:03:52 +02:00
Adam Skory
4dd853a643 Merge "Squash unreachable catch" 2014-06-06 10:07:03 +00:00
Kenny Guy
adf2ea2bfd Merge "Badge notification from managed profiles." into lmp-preview-dev 2014-06-06 10:06:41 +00:00
John Spurlock
5936a19659 am 0fbd9364: Merge "VolumeZen: Only display active condition when entering." into lmp-preview-dev 
* commit '0fbd936409cdc233821f3d29b3ec12738febbf62':
  VolumeZen: Only display active condition when entering.
 2014-06-06 03:42:48 +00:00
John Spurlock
7e984a953e Merge "VolumeZen: Only display active condition when entering." into lmp-preview-dev 2014-06-06 03:39:29 +00:00
John Spurlock
3ae5b35142 am 01566c37: Merge "QuickSettings: Bluetooth updates." into lmp-preview-dev 
* commit '01566c37846b7ad9e4173f2ae50de78ca8c05495':
  QuickSettings: Bluetooth updates.
 2014-06-06 03:32:36 +00:00
John Spurlock
a2cd733c23 Merge "QuickSettings: Bluetooth updates." into lmp-preview-dev 2014-06-06 03:28:29 +00:00
John Spurlock
a625b74120 QuickSettings: Bluetooth updates. 
- Use "Bluetooth" string when connecting.
- Use @hidden device alias (instead of name) for label.
- Use the same icon in the status bar.

Bug:15186962
Change-Id: I25613bebf069c91e76d6933f2512b3f0a8020474
 2014-06-05 23:20:15 -04:00
John Spurlock
2769ac2907 VolumeZen: Only display active condition when entering. 
Instead of always displaying the active condition, only
show it the first time (when turning zen on).

Bug:15455271
Change-Id: I89e8e2c09fa0d06a5e4c3174f825dfe5a452f06e
 2014-06-05 20:55:49 -04:00
ztenghui
537d7ea039 am 42decb1b: Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev 
* commit '42decb1bfe354923205a7cdf856f395f9070b64f':
  API Review: move the CreateRevealAnimator to ViewAnimationUtils
 2014-06-05 22:39:11 +00:00
ztenghui
2050d39e08 Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev 2014-06-05 22:32:41 +00:00
ztenghui
62f30e0bb1 API Review: move the CreateRevealAnimator to ViewAnimationUtils 
b/15451650

Change-Id: If270bbf757047ce7847cab457d3836d756830124
 2014-06-05 13:45:15 -07:00
Winson Chung
87d8ac9cf9 am 16b5e60d: Merge "Fixing issue with broadcast being sent before boot completed." into lmp-preview-dev 
* commit '16b5e60d49ea952a86f71da479a980e37ea652cf':
  Fixing issue with broadcast being sent before boot completed.
 2014-06-05 20:08:57 +00:00
Winson Chung
1494f8671e Merge "Fixing issue with broadcast being sent before boot completed." into lmp-preview-dev 2014-06-05 20:04:40 +00:00
Dan Sandler
ed50e94d6c am 4ccaa092: Merge "Don\'t show private notifications if a secure lockscreen is merely occluded." into lmp-preview-dev 
* commit '4ccaa092d49deb84885b5daf2e6d6f1c745d56bf':
  Don't show private notifications if a secure lockscreen is merely occluded.
 2014-06-05 20:04:36 +00:00
Winson Chung
5abdceb64b Fixing issue with broadcast being sent before boot completed. 
Bug: 15444478
Bug: 15109101
Change-Id: I0fd5d32761c84ff237bce8328f23907bbf12ee6a
 2014-06-05 20:01:25 +00:00
Selim Cinek
561d5aa8ac am 2d49b682: Merge "Fix PanelView over expanding behavior." into lmp-preview-dev 
* commit '2d49b682522cf8ec90bfd3e3fde468b44919ccae':
  Fix PanelView over expanding behavior.
 2014-06-05 18:38:49 +00:00
Dan Sandler
71f507bbe9 Merge "Don't show private notifications if a secure lockscreen is merely occluded." into lmp-preview-dev 2014-06-05 18:35:49 +00:00
Jorim Jaggi
47c85a3525 Fix PanelView over expanding behavior. 
Fixes a bug that the panel height was wrongly calculated and lagging
one frame behind. Also fixes the animation when overscrolling and
then flinging the panel to collapse. In addition, the logic to handle
the over expanding is much cleaner and calculated in an absolut
manner (before, it was relative an really complicated to understand).

Bug: 14487435
Change-Id: If8dbb3e063ef63f51f6dac0ae5bf276480514103
 2014-06-05 19:54:42 +02:00
Kenny Guy
8a0101bade Badge notification from managed profiles. 
Add a method to the UserManager to provide access
to bitmap of badge for managed profile.
Overlay the icon view in notification templates with
the badge from the UserManager.
Notifications with custom views won't be badged.

Bug: 12641490

Change-Id: I1f2aae927e75fc8a955e4d5bbc3cc81127d87069
(cherry picked from commit 0f4ab980227e8c298bfcd34dd85aad0febad528c)
 2014-06-05 16:58:52 +00:00
Kenny Guy
d0969135aa Merge "Badge notification from managed profiles." 2014-06-05 14:20:35 +00:00
Adam Skory
0212c563c8 Squash unreachable catch 
The compiler warning distracts me often.

Change-Id: Ia96e6c82ce1c0f1ae58f7faadbf8769b36d1f810
 2014-06-05 14:38:30 +01:00
Dan Sandler
4b22bdfa84 Don't show private notifications if a secure lockscreen is merely occluded. 
Bug: 15430088
Change-Id: I27187216462b5bb7d52c3f85b9444348138fd9ea
 2014-06-05 03:04:34 -04:00
Selim Cinek
2a3606ba4a am 2b81c8ef: Merge "Simplified maxPanelHeight logic." into lmp-preview-dev 
* commit '2b81c8ef66cb046d96a950c5cf93cfb9015f4e40':
  Simplified maxPanelHeight logic.
 2014-06-04 22:11:30 +00:00
Elliott Hughes
3407c25499 am fc01a668: am c1973c28: am c0f4ac1b: Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag" 
* commit 'fc01a6687ba6e51a40bf448cf33367d1f1216544':
  Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
 2014-06-04 21:53:17 +00:00
Elliott Hughes
fc01a6687b am c1973c28: am c0f4ac1b: Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag" 
* commit 'c1973c2888bde77f2dd5dbdba6225afb8829ed46':
  Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
 2014-06-04 21:48:08 +00:00
Selim Cinek
ba9547c0af am 62f877c7: Merge "Fixed an animation bug" into lmp-preview-dev 
* commit '62f877c7226450edcc5548fbd89be67665b65947':
  Fixed an animation bug
 2014-06-04 21:32:51 +00:00
Elliott Hughes
c0f4ac1bb8 Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag" 2014-06-04 21:13:57 +00:00