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

34316 Commits

Author SHA1 Message Date
Jason Monk
77857df729 Merge "Convert signal icon to be custom drawable" into oc-dev am: 06426bf652 
am: 389755704e

Change-Id: Idce35feb4c53e68970a289b4e811b2a2e9b09d01
 2017-04-14 21:08:45 +00:00
Jason Monk
389755704e Merge "Convert signal icon to be custom drawable" into oc-dev 
am: 06426bf652

Change-Id: I3fddf788317b91e65c22ec75bb3e6aa0509f64fe
 2017-04-14 20:58:31 +00:00
Mady Mellor
f9eb4e8716 Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev am: 4b7b01c1cc 
am: daf76b82ae

Change-Id: Ia7b9f62d9040a98193e0ed79a259e0741538f494
 2017-04-14 20:54:56 +00:00
Mady Mellor
daf76b82ae Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev 
am: 4b7b01c1cc

Change-Id: Ib51c0125042553302584c79a360ee07f2ae1c1b8
 2017-04-14 20:48:02 +00:00
TreeHugger Robot
06426bf652 Merge "Convert signal icon to be custom drawable" into oc-dev 2017-04-14 20:44:19 +00:00
Mady Mellor
4b7b01c1cc Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev 2017-04-14 20:40:03 +00:00
Adrian Roos
8c4a48f389 Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev am: b160141698 
am: a1da551856

Change-Id: I15b1d29ae469449c3861c2b743cf4b28e777108a
 2017-04-14 19:40:20 +00:00
Adrian Roos
a1da551856 Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev 
am: b160141698

Change-Id: I22c165cb1a366e967bebf369ed79eaf86da995a4
 2017-04-14 19:35:31 +00:00
TreeHugger Robot
b160141698 Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev 2017-04-14 19:24:40 +00:00
Jason Monk
48edc0c628 Convert signal icon to be custom drawable 
This will make it really easy to change the number of bars it
displays.

Test: runtest systemui
Change-Id: If0b8a606f56430ea08fa0887af85aa0e90de1d40
Fixes: 35902355
 2017-04-14 15:04:09 -04:00
Alan Viverette
14b3375e43 Merge "Remove unnecessary casts on calls to findViewById" into oc-dev am: 7c8ab2651b 
am: efc602c307

Change-Id: Id991d413933d8435a05b129bf13e917941371c01
 2017-04-14 18:25:53 +00:00
Alan Viverette
568b59c62c Merge "Update more implementations of findViewById()" into oc-dev am: b7f0db8d89 
am: 2de6b0dab0

Change-Id: I03772206b8849237e1138303229c6ed1c3c2b432
 2017-04-14 18:24:27 +00:00
Winson Chung
ebb2bbba57 Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev am: 2e86be7653 
am: 3a32d35723

Change-Id: Ie6ef27e0d233debca4884c5628c076121c8a5b34
 2017-04-14 17:53:03 +00:00
Jesse Evans
632e4afb1a Merge "Fix instant app filtering in ApplicationsState" into oc-dev am: 9bdaa9c9fa 
am: 783026710d

Change-Id: Id5a474354f69264a6959e8334f014860f6c98c8e
 2017-04-14 17:41:47 +00:00
Winson Chung
e0c9bc1582 Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev am: 4191d99614 
am: 7031cdda50

Change-Id: I6eb6069005460d372288d79b8a2387518842e73f
 2017-04-14 17:40:39 +00:00
Mady Mellor
b9b4a78562 Merge "Merge "Visual changes to PIP drag to dismiss UI" into oc-dev am: 59c124b755" into oc-dev-plus-aosp 
am: 900f022984

Change-Id: I937d985fe18e1e0ebc9e5d1a92c154223d95d6b0
 2017-04-14 17:24:22 +00:00
Alan Viverette
efc602c307 Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 
am: 7c8ab2651b

Change-Id: I82826b63a3d6bc527c696158bfab98fe438f9847
 2017-04-14 17:04:19 +00:00
TreeHugger Robot
7c8ab2651b Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 2017-04-14 16:56:28 +00:00
Daniel Nishi
58e291f1a5 Merge "Don't crash in background after app uninstall." into oc-dev am: 74037d1287 
am: f110127aef

Change-Id: Id0c46b2669af8386792dccd12407d8de6dc66d05
 2017-04-14 16:47:12 +00:00
Alan Viverette
2de6b0dab0 Merge "Update more implementations of findViewById()" into oc-dev 
am: b7f0db8d89

Change-Id: Iaa7a100c54305623e908ec325575d936ecbaf26a
 2017-04-14 16:33:14 +00:00
TreeHugger Robot
b7f0db8d89 Merge "Update more implementations of findViewById()" into oc-dev 2017-04-14 16:26:27 +00:00
Selim Cinek
58c5d5abca Merge changes Icc9c36f7,I723474e2 into oc-dev am: 07525d4f25 
am: f1f29ca50b

Change-Id: Iff0c951c0a1e27f6285f994df3a6f40c9a3bd8e3
 2017-04-14 16:19:57 +00:00
Lei Yu
f69156ff95 Merge "Refine BatteryInfo and battery drawable" into oc-dev am: 57af565fb7 
am: 24638307c2

Change-Id: Ifae38f01a454fe9dcea1fbde0ea1a57a15087d8a
 2017-04-14 16:18:02 +00:00
Jason Monk
e30503f485 Merge "Fix location status bar icon" into oc-dev am: d2b368a68d 
am: 2e55245f98

Change-Id: I2dabf81060d98a2dcbec6487900c7148fc4daa07
 2017-04-14 16:08:42 +00:00
Jason Monk
108b8ec82a Merge "Fix leak in nav bar" into oc-dev am: 0b67d53ba9 
am: cea904333e

Change-Id: I51b2753f46f5b18e791af39020aab2c8547981df
 2017-04-14 16:01:02 +00:00
Jason Monk
ecb4a9b390 Merge "Update mobile data icon" into oc-dev am: 99856429db 
am: 4520cb7ad9

Change-Id: I5fc19134a1ec0da5d4ede330a0d430ed428a53fa
 2017-04-14 15:35:20 +00:00
Daniel Sandler
7775be8a74 Merge "Quick fix to lockscreen text color." into oc-dev am: f06c2a01a5 
am: dc4fd3c847

Change-Id: Ieb6074d94b85a04ac7c87b5295b52817b2671c8e
 2017-04-14 15:28:56 +00:00
Alan Viverette
51efddbd3b Remove unnecessary casts on calls to findViewById 
Just frameworks/ this time. More paths to come.

Bug: 24137209
Test: make -j32
Change-Id: Iff27abd26fa43296ac2fff8f534fc6742d2ae80c
 2017-04-14 11:15:50 -04:00
Benoit Lamarche
309335e727 resolve merge conflicts of 57fb5872d19c to master 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icc3fa0cd65fd6cd952008bdd068d527e20c81ae8
 2017-04-14 15:59:04 +02:00
Winson Chung
3a32d35723 Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev 
am: 2e86be7653

Change-Id: Idec10c8c0aadccabcd639b5a02e426dc677b9f14
 2017-04-14 05:22:04 +00:00
Winson Chung
2e86be7653 Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev 2017-04-14 05:12:54 +00:00
Jesse Evans
783026710d Merge "Fix instant app filtering in ApplicationsState" into oc-dev 
am: 9bdaa9c9fa

Change-Id: I1f3b4dfe6c6f9f53c9af5483ab4b31726026d219
 2017-04-14 04:56:33 +00:00
Winson Chung
7031cdda50 Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev 
am: 4191d99614

Change-Id: I257467c0f950af3a1b27bbff21e466323babe513
 2017-04-14 04:50:03 +00:00
TreeHugger Robot
9bdaa9c9fa Merge "Fix instant app filtering in ApplicationsState" into oc-dev 2017-04-14 04:49:43 +00:00
TreeHugger Robot
4191d99614 Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev 
* changes:
  Fixing missing movement bounds notification to SystemUI.
  Fixing animating bounds regression.
  Tightening up rotation behavior for PIP (2/3)
  Tightening up rotation behavior for PIP (1/3)
 2017-04-14 04:39:01 +00:00
Mady Mellor
65aed22863 Merge "Visual changes to PIP drag to dismiss UI" into oc-dev 
am: 59c124b755

Change-Id: I38781516da59f84f829699e2ef9c1db27e7578b6
 2017-04-14 04:27:08 +00:00
Jesse Evans
ad2b77565c Fix instant app filtering in ApplicationsState 
This fixes instant apps showing up as installed apps in the settings
UI where they should not be (namely the opening links page).

Test: Added tests for the filter
      runtest -x packages/SettingsLib/tests/integ

Bug: 37108030
Change-Id: I0fc6cfd237d470a1f4dde7b2db38d8b3643ee6f7
 2017-04-13 19:48:48 -07:00
TreeHugger Robot
59c124b755 Merge "Visual changes to PIP drag to dismiss UI" into oc-dev 2017-04-14 02:40:01 +00:00
Winson Chung
32c566fe6e Fixing missing movement bounds notification to SystemUI. 
- When WM updates from a configuration change, ensure that we update the
  pinned stack controller even if there is currently no pinned stack.
- Also finish the menu activity once an activity is unpinned.

Bug: 36879891
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I789945c1783693cf4b4e3d6663548c8669784001
 2017-04-13 19:27:31 -07:00
Daniel Nishi
f110127aef Merge "Don't crash in background after app uninstall." into oc-dev 
am: 74037d1287

Change-Id: I261336a0d6b729dfba31a812cfa106ffc01f9931
 2017-04-14 01:07:18 +00:00
Daniel Nishi
74037d1287 Merge "Don't crash in background after app uninstall." into oc-dev 2017-04-14 00:56:19 +00:00
Mady Mellor
b91efb8b36 Visual changes to PIP drag to dismiss UI 
Updated gradient asset, spacing, and added shadow to text

Test: Manual: have a PIP, move it around, observe drag to dismiss UI
Bug: 35358628
Change-Id: I8614468edfc14d0337d69184a7bbab5419f22ec3
 2017-04-13 17:20:15 -07:00
Selim Cinek
f1f29ca50b Merge changes Icc9c36f7,I723474e2 into oc-dev 
am: 07525d4f25

Change-Id: I84d476d21e920fdd28e8e1f7c18d54d3eaf1e23b
 2017-04-13 23:02:41 +00:00
Selim Cinek
07525d4f25 Merge changes Icc9c36f7,I723474e2 into oc-dev 
* changes:
  Fixed a crash when expanding
  Fixed the visual appearance on heads-up notifications
 2017-04-13 22:52:16 +00:00
Anthony Chen
f1fb227f1c Merge "Allow the "clear all" button to be toggled." 2017-04-13 22:32:01 +00:00
Lei Yu
24638307c2 Merge "Refine BatteryInfo and battery drawable" into oc-dev 
am: 57af565fb7

Change-Id: Ie9fce326b23293e9f66d71f4be4b166aae310eb0
 2017-04-13 21:52:40 +00:00
Lei Yu
57af565fb7 Merge "Refine BatteryInfo and battery drawable" into oc-dev 2017-04-13 21:43:37 +00:00
Winson Chung
be4a808b3d Fix issue where we weren't dismissing the pip menu activity. 
- Also don't crash if we get a deferred call to resize the pinned stack
  that no longer exists.

Bug: 36049843
Test: Try to pinch and expand pip
Change-Id: I64c42e47c466c641464c4f22a20bded2209e29eb
 2017-04-13 13:52:04 -07:00
Alan Viverette
04fd470ce0 Update more implementations of findViewById() 
Bug: 24137209
Test: make checkbuild -j32
Change-Id: I104969fc74d6dc1d159e3d1ff5926640b124a540
 2017-04-13 16:50:32 -04:00
Jason Monk
2e55245f98 Merge "Fix location status bar icon" into oc-dev 
am: d2b368a68d

Change-Id: Ibe7699d1ad05a5c261620838a270faf99ba66697
 2017-04-13 20:35:37 +00:00