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

34337 Commits

Author SHA1 Message Date
Adrian Roos
bca5cb30a5 Merge "AOD: Prolong AOD2 after interaction, turn off AOD when prox covered" into oc-dev am: 490ef3cda4 
am: 153159130f

Change-Id: Iabcf85cb191df80d1a24277dd420e3045838ded8
 2017-04-15 02:02:40 +00:00
Adrian Roos
153159130f Merge "AOD: Prolong AOD2 after interaction, turn off AOD when prox covered" into oc-dev 
am: 490ef3cda4

Change-Id: I6a808b422c23e0bd695d8422150e57ed9cf874ad
 2017-04-15 01:58:55 +00:00
Adrian Roos
490ef3cda4 Merge "AOD: Prolong AOD2 after interaction, turn off AOD when prox covered" into oc-dev 2017-04-15 01:48:31 +00:00
Wale Ogunwale
38b05ffa3f Merge "Reduce effect on PipMenuActivity during animation" into oc-dev am: 47dea3b16d 
am: a1ba99cbb0

Change-Id: I62498300c52361aad5a81ec7bec58c2e98748347
 2017-04-15 01:34:27 +00:00
TreeHugger Robot
75c6800138 Merge "Null-check mNavigationBar when returning its view." 2017-04-15 01:31:12 +00:00
Wale Ogunwale
a1ba99cbb0 Merge "Reduce effect on PipMenuActivity during animation" into oc-dev 
am: 47dea3b16d

Change-Id: I57a59e7fe55c50bb69dad7e0de3b8b11a2bb9638
 2017-04-15 01:28:03 +00:00
Jeff Sharkey
0684c076ef Merge "Clear identity to handle ALLOCATE_AGGRESSIVE." into oc-dev am: dec3638c1f 
am: 5b0d782531

Change-Id: I1e5e8fb84a8489aa1cabc32572e55d6898c02592
 2017-04-15 01:19:38 +00:00
TreeHugger Robot
47dea3b16d Merge "Reduce effect on PipMenuActivity during animation" into oc-dev 2017-04-15 01:18:36 +00:00
Jeff Sharkey
5b0d782531 Merge "Clear identity to handle ALLOCATE_AGGRESSIVE." into oc-dev 
am: dec3638c1f

Change-Id: I9cc266dd67fac65859d86f77f085eb45b4e73701
 2017-04-15 00:36:24 +00:00
TreeHugger Robot
dec3638c1f Merge "Clear identity to handle ALLOCATE_AGGRESSIVE." into oc-dev 2017-04-15 00:30:32 +00:00
Philip Quinn
c0c18cafef Null-check mNavigationBar when returning its view. 
Without this check there's no way to avoid a NullPointerException if
getNavigationBarView() is called before the navigation bar fragment is
created.

Bug: 36852229
Bug: 37330416
Bug: 37331698
Fixes: 36508501
Test: make -j; cannot reproduce bugs.
Change-Id: Ia3c9b4eaea26b78cdc39a446918047eb1f440d70
 2017-04-14 16:54:42 -07:00
Eugene Susla
c242b76a4b [DO NOT MERGE] Stop scan on device chooser activity backgrounded 
am: 200c37f413

Change-Id: I29fbe568cccac08e6fa28ec8cf1c027290d35efc
 2017-04-14 23:30:46 +00:00
Eugene Susla
24cf2d9d72 [DO NOT MERGE] Improve the error msg when started not for result 
am: 5423b4e0a8

Change-Id: I44b112065b12b10cfd00498479380a9c5ad57be4
 2017-04-14 23:23:45 +00:00
Svetoslav Ganov
c9741d133d Merge "[DO NOT MERGE] Fix a bug with filtering by raw bytes" into oc-dev 
am: 728ce60465

Change-Id: Ic89d0c7084e56e24a358191660aeebe917df6b4b
 2017-04-14 23:18:03 +00:00
Eugene Susla
200c37f413 [DO NOT MERGE] Stop scan on device chooser activity backgrounded 
This effectively treats chooser activity pause event as cancel.

Bug: 30932767
Test: Install two toy apps and call associate API from both.
  Ensure foreground app always end up showing fresh data.

Change-Id: I7f5742e9878245550f678efd244bf84c427baef3
 2017-04-14 23:17:04 +00:00
Eugene Susla
5423b4e0a8 [DO NOT MERGE] Improve the error msg when started not for result 
This makes sure that if the association request callback IntentResult
s accidentally started not for result, the resulting exception is
metioning it explicitly.

Test: Ensure the error message when calling the IntentSender not for result
  explicitly mentions the requirement for the activity to be called for result.
Bug: 30932767

Change-Id: I950f262af43c555fb20dd5e49e935e476f24bba8
 2017-04-14 23:15:12 +00:00
Svetoslav Ganov
728ce60465 Merge "[DO NOT MERGE] Fix a bug with filtering by raw bytes" into oc-dev 2017-04-14 23:11:30 +00:00
Eugene Susla
3c9aa1767c [DO NOT MERGE] Fix a bug with filtering by raw bytes 
(when such filter is not provided)
See change in BluetoothDeviceFilterUtils

Bug: 30932767
Test: Call API with a BLE filter with no raw bytes filter, matching some device.
Ensure that the device eventually shows up.

Change-Id: I4397fa33dd0c48771c8a754791a171f2d0bd64eb
 2017-04-14 23:10:20 +00:00
Adrian Roos
67cca7442b AOD: Prolong AOD2 after interaction, turn off AOD when prox covered 
Turns off AOD 1 and 2 when the proximity sensor is covered.
Also extends the AOD2 duration when the screen is touched or
the lift gesture is triggered.

Also fixes some issues with the fingerprint unlock transition
from AOD where the doze state for the NotificationPanelView
was cleared too early.

Also hides the wallpaper while we're dozing.

Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java
Fixes: 36893539
Fixes: 36893538
Fixes: 36033906
Fixes: 37327153
Change-Id: I3fccae1515a0daf2ff99589ed78ec947687e6262
 2017-04-14 22:59:26 +00:00
Jeff Sharkey
9a4a457622 Clear identity to handle ALLOCATE_AGGRESSIVE. 
We're not actually clearing any files, only deciding how much free
space is available, so we're fine assuming the remote caller has the
permission.

Test: builds, boots
Bug: 37169076
Change-Id: I6cd42f77c43e9d2de40e2b8b937c7f2145f1b869
 2017-04-14 16:29:04 -06:00
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
Wale Ogunwale
5e8ecb0f34 Reduce effect on PipMenuActivity during animation 
- Set windowDisablePreview to true so no starting window is added for
the pip menu activity.
- setDisablePreviewScreenshots() so we don't waste time taking
screenshot for the pip menu activity.

Test: manual
Change-Id: I327603b9b0edc0baff779b00c8f6f035852aad15
 2017-04-14 13:32:19 -07: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