Commit Graph

8097 Commits

Author SHA1 Message Date
Justin Klaassen
93bd71f10a Merge "Reset last activated time after auto mode changed" into oc-dr1-dev
am: 13cfb46e41

Change-Id: Ic54dae12f687caf5288ccbf3cd3c842ce4742721
2017-06-20 23:56:13 +00:00
Justin Klaassen
4bcc06f39c Reset last activated time after auto mode changed
Fixes: 62749129
Test: runtest -c com.android.server.NightDisplayServiceTest \
      frameworks-services
Change-Id: I7e5a4c56cd20be70e693aa2327972b5da77b6f27
2017-06-20 13:29:43 -07:00
Vladislav Kaznacheev
6063096518 Merge "Do not update currently open tooltip." into oc-dev am: 139dbe5c1c
am: 3fd4215760

Change-Id: I4b9674e73830462bbe9288ebfa1bbac89af860b3
2017-06-19 21:24:11 +00:00
Vladislav Kaznacheev
2102c3211c Merge "Do not update currently open tooltip." into oc-dev
am: 139dbe5c1c

Change-Id: Ia3fc1f16e71a4a12a0a84704b7ca7a9d2ec33514
2017-06-19 21:12:45 +00:00
Vladislav Kaznacheev
3fd4215760 Merge "Do not update currently open tooltip." into oc-dev
am: 139dbe5c1c

Change-Id: Ia0b5b2c7ee9dc8a0cc975562de350ac0ff4a0449
2017-06-19 21:12:41 +00:00
Lucas Dupin
af26f72fb8 Merge "K-Means color clustering" into oc-dr1-dev
am: 11cc260047

Change-Id: If99425cb57a322900f476227932cdcadd85abf00
2017-06-17 17:26:20 +00:00
Lucas Dupin
1d3c00d5c7 K-Means color clustering
Test: runtest -x tests/Internal/src/com/android/internal/ml/clustering/KMeansTest.java
Bug: 37014702
Change-Id: Idabc163df5ded362acbe462ae6b351394a36db10
2017-06-16 18:04:42 -07:00
Vladislav Kaznacheev
dd469d171d Do not update currently open tooltip.
Currently if View.setTooltipText is called while
the tooltip is being shown for that view, it will
update the displayed text. The tooltip then will
resize to wrap around the new text, but not change
its position. This looks confusing if the new text
is significantly shorter or longer.

Removing this functionality until proper
re-positioning is implemented.

Bug: 38491655
Test: android.view.cts.TooltipTest passes
Change-Id: I79689288185888854b992b89e19fe381d3ac50e4
2017-06-16 11:31:23 -07:00
Chris Thornton
2fe6586160 Merge "Add SoundTriggerManager APIs to use a PendingIntent to get callbacks." into oc-dr1-dev
am: 6f071c369e

Change-Id: I98f9c06856a70a5a4b3634f41860068c331f0c83
2017-06-14 19:16:36 +00:00
TreeHugger Robot
6f071c369e Merge "Add SoundTriggerManager APIs to use a PendingIntent to get callbacks." into oc-dr1-dev 2017-06-14 19:10:43 +00:00
Chris Thornton
ba08b7945a Add SoundTriggerManager APIs to use a PendingIntent to get callbacks.
Test: APIs exercised using a special test app not in this CL.

Change-Id: I99425d1e67a778513e6c75e7d595c072032aa2ab
2017-06-13 18:37:48 -07:00
Eugene Susla
dfa5272295 Merge "Support associating with an already-paired device" into oc-dev am: c041c7a34e
am: c26f789ae2

Change-Id: Ice5843da51415f87140a6311415a7074b155cdb3
2017-06-14 00:24:12 +00:00
Eugene Susla
c26f789ae2 Merge "Support associating with an already-paired device" into oc-dev
am: c041c7a34e

Change-Id: I31ab12934cd18aace7aece30fd5551e20e02216e
2017-06-14 00:17:25 +00:00
Eugene Susla
99f209be12 Merge "Support associating with an already-paired device" into oc-dev
am: c041c7a34e

Change-Id: I0af2c5f93b8e0387f28f9c34c81b20ad5a9875e2
2017-06-14 00:17:19 +00:00
TreeHugger Robot
c041c7a34e Merge "Support associating with an already-paired device" into oc-dev 2017-06-14 00:03:53 +00:00
Wale Ogunwale
a5e833e846 Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am: e1e0db8ca9
am: 90159a2492

Change-Id: I0092411f5b8bef853b55e6ffe7bdf700876f7715
2017-06-13 01:08:25 +00:00
Wale Ogunwale
5323b2d4cd Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
am: e1e0db8ca9

Change-Id: I2d854e36c31a8fa1cf74e5c5a536969ee94dc79b
2017-06-13 01:01:51 +00:00
Vladislav Kaznacheev
6fa65bbdd6 Merge changes from topic 'sysui-tooltip' into oc-dev am: 3fbcec5b86
am: 7e21054200

Change-Id: Icfe6bb79c13c6e0ef925f30933f7831978a2886c
2017-06-13 00:32:20 +00:00
Vladislav Kaznacheev
bc168cf9d5 Merge changes from topic 'sysui-tooltip' into oc-dev
am: 3fbcec5b86

Change-Id: I7affdad6abfb283c0eec6718797f7d8580ea507b
2017-06-13 00:31:02 +00:00
Jeff Sharkey
de624f3fbb Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev
am: f7dc56ecc9

Change-Id: Ic66cdb0548cf8c973214364843cf147ac5d231be
2017-06-13 00:14:55 +00:00
Wale Ogunwale
90159a2492 Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
am: e1e0db8ca9

Change-Id: Ie70addce27b9551323d7c9d8f9576aa118b98114
2017-06-13 00:02:11 +00:00
Wale Ogunwale
e1e0db8ca9 Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev 2017-06-12 23:51:19 +00:00
Eugene Susla
0c4a926626 Support associating with an already-paired device
This is required for migration scenario, where device(s) are already
paired(and thus no longer discoverable) but didn't go through companion
flow.
This also fixes a bug with filtering by mac address, which is also relevant to
the use-case of associating a specific device

Test: Pair with a device first, and call associate with a filter with its MAC
address and single device requested. Ensure the device is found.
Ensure only that device is ever returned when filtering by MAC address.
Bug: 62487084
Change-Id: Ic7cc6affc0648ad85b15620e8c3aba4b9fc91aa1
2017-06-12 16:21:51 -07:00
Vladislav Kaznacheev
7e21054200 Merge changes from topic 'sysui-tooltip' into oc-dev
am: 3fbcec5b86

Change-Id: I9ff9e36b3fa7c0e3c0bd4cd2048f9d0ce510399c
2017-06-12 21:51:10 +00:00
Jeff Sharkey
35e46d2972 Active camera apps can defy reserved cache space.
We normally prevent apps from allocating into the "reserved" cache
space, but this change makes an exception for an active camera app,
since the user is probably trying to capture an important memory.

This change only lets the active camera app clear up to half of the
reserved space, since we don't want to completely destroy the
experience of all other apps.

Test: manual app before/during/after active camera session
Bug: 38267830
Change-Id: Ie9e63884fb2638ca881e10b894629eea84601648
2017-06-12 14:27:23 -06:00
Vladislav Kaznacheev
d85915f786 Pass window token when creating a tooltip popup
This allows using tooltips in System UI.

Bug: 62065980
Test: android.view.cts.TooltipTest passes
Change-Id: If0a76d0806aa92efa4be57204c4517242b0ebb99
2017-06-12 12:10:49 -07:00
Vladislav Kaznacheev
7410170ddc Revert "Use a PopupWindow to show tooltips"
This reverts commit 77e539775b.

Change-Id: Ic4054e0d507ce95ab93282d4da002dd804aeb26d
2017-06-12 12:02:11 -07:00
Winson Chung
4a526c1245 Ensure that we use SF Vsync Choreographer for the PiP transition.
- Move the bounds animation onto the animation thread
- Remove existing code referencing the old sf-vsync choreographer
- Add ability for ValueAnimator subclasses to reference a different
  AnimationHandler, which uses a different FrameCallbackProvider with the
  sf-vsync choreographer in the animations that require it
- Ensure that PiP touch events are batched and sent aligned with the
  sf-vsync
- Move GC onto its own thread to not block other BackgroundThread calls

Bug: 36371375
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: bit FrameworksServicesTests:com.android.server.wm.BoundsAnimationControllerTests
Test: go/wm-smoke

Change-Id: I6a41b35a4e4d4d6dbea82c2673452825fe3ffa58
2017-06-12 10:08:58 -07:00
Siyamed Sinir
a02dcdcebc Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358
am: f99e84e4dd

Change-Id: I04a26678d8df05ea59bcec48061f027b0b567baf
2017-06-09 22:20:15 +00:00
Siyamed Sinir
f99e84e4dd Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
am: bc626c6358

Change-Id: I4d3cff4bf6a0403f311011709c3074bca532de15
2017-06-09 21:56:09 +00:00
Siyamed Sinir
c1801c9a8d Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
am: bc626c6358

Change-Id: I8688bda33124a78d439f1cbcf23926a0672b0735
2017-06-09 21:37:17 +00:00
jackqdyulei
5047d7bf7f Copy smearing method to BatteryStatsHelper
am: 5dad8068e2

Change-Id: I1a99fc38a665c3219999b464c1549dd707832f3d
2017-06-09 21:15:56 +00:00
Siyamed Sinir
bc626c6358 Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev 2017-06-09 20:58:36 +00:00
Lei Yu
883db32859 Merge changes from topic 'battery_smear_move' into oc-dev
* changes:
  Batterystats logs smeared power model values
  Copy smearing method to BatteryStatsHelper
2017-06-09 20:50:47 +00:00
Lei Yu
35aa7879be Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev
am: 02ece2f486

Change-Id: I395712265d3d159c26c4f69f2a7abdfe31398aff
2017-06-09 17:52:41 +00:00
Lei Yu
02ece2f486 Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev 2017-06-09 17:46:33 +00:00
Siyamed Sinir
484c2e2fbe Force Autofill in FloatingToolbar overflow menu
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
bit CtsWidgetTestCases:android.widget.cts.EditTextTest

Bug: 62271937
Change-Id: Ib3447281f3bd1abc811a25fc55ad55e34e155bbb
2017-06-08 17:16:26 -07:00
jackqdyulei
5dad8068e2 Copy smearing method to BatteryStatsHelper
This cl adds the following data in BatterySipper
1. screenPowerMah: power smeared by screen
2. proportionalSmearMah: power need to smeared proportionally
3. displayPowerMah: smeared power usage

This cl also copies bunch of methods from BatteryUtils to
BatteryStatsHelper with minor changes, so we could log smearing
logic in BatteryStatsHelper

Bug: 62300864
Test: runtest -x BatteryStatsHelperTest
Change-Id: I9f92f5c1ac5fa483d0c15a3d5daad570da68a7ff
Merged-In: I9f92f5c1ac5fa483d0c15a3d5daad570da68a7ff
2017-06-08 15:10:34 -07:00
jackqdyulei
1424c1d77c Copy smearing method to BatteryStatsHelper
Cherry pick: fix conflict in config.xml

This cl adds the following data in BatterySipper
1. screenPowerMah: power smeared by screen
2. proportionalSmearMah: power need to smeared proportionally
3. displayPowerMah: smeared power usage

This cl also copies bunch of methods from BatteryUtils to
BatteryStatsHelper with minor changes, so we could log smearing
logic in BatteryStatsHelper

Bug: 62300864
Test: runtest -x BatteryStatsHelperTest
Change-Id: I9f92f5c1ac5fa483d0c15a3d5daad570da68a7ff
2017-06-08 11:32:31 -07:00
Andreas Gampe
f037caed37 Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
am: 837f1167ca

Change-Id: I2a510538bace272330e1d4446adf2451f3bb4c07
2017-06-08 05:54:32 +00:00
Sudheer Shanka
54a6869814 Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am: f34713066e
am: 736cb0e33a

Change-Id: Ia4ae2f57539d652e9a898e4eb62d6b1bbc0de06a
2017-06-08 05:45:37 +00:00
Sudheer Shanka
2bb4966dab Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
am: f34713066e

Change-Id: Ic001bfa12fecb00b24d7170c841af21531bab28a
2017-06-08 05:44:49 +00:00
TreeHugger Robot
837f1167ca Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp 2017-06-08 01:08:24 +00:00
Sudheer Shanka
736cb0e33a Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
am: f34713066e

Change-Id: I7ba4faeae53df155de0a25347efcc15974f2cc8c
2017-06-08 00:15:23 +00:00
Andreas Gampe
dc7f65ac64 Framework: Remove SamplingProfiler
Remove the very old and unsupported SamplingProfilerIntegration. This
CL removes the code parts.

(cherry picked from commit d52cad2cc9)

Bug: 37272346
Test: m
Test: Device boots
Change-Id: I64d77244b5816ef1f605d19530b96be38f5c1bc6
2017-06-07 20:08:44 +00:00
Sudheer Shanka
6d8dcec872 Update KernelUidCpuFreqTimeReader to handle uid removals.
Bug: 34133340
Test: manual
Change-Id: Iaad2061671d83e1ff6d2797e166ae903f6faec13
2017-06-06 15:31:51 -07:00
Dan Sandler
0b5efb3b53 Updates to Dianne's Dungeon.
- new EKG icon
 - set the notification timestamp to the oldest service
   start time, so you have some idea how long things have been
   this way
 - minor text fixes

Bug: 36891897
Test: runtest -x cts/tests/app/src/android/app/cts/ServiceTest.java
Change-Id: I37c76ae86bcaee7c946863add041bbd1ca678cf9
2017-06-06 17:36:26 -04:00
Ahmed ElArabawy
dd3b200c19 Merge "Revert "Revert "power hal: Use power HAL API 1.1""" 2017-06-06 16:01:55 +00:00
Sudheer Shanka
1e52f216af Merge "Ignore entries for isolated uids if there's no mapping for them." into oc-dev am: 057bad9c9d
am: cefa28dc8a

Change-Id: I0dac209a9a5af6f5b83ea0d9706a29e5f6a97df4
2017-06-06 15:31:17 +00:00
TreeHugger Robot
2878977277 Merge "add skeleton CarServiceHelperService" 2017-06-05 23:20:28 +00:00