Commit Graph

8041 Commits

Author SHA1 Message Date
Abodunrinwa Toki
656d33f323 Merge "Fix FloatingToolbar refresh on menu changes." into oc-dev
am: 7c4998e614

Change-Id: Id7e6c2485fa3a0519b77dd64498808d255f10fbc
2017-05-23 16:10:59 +00:00
Abodunrinwa Toki
29a03ce74e Merge "Ensure FloatingActionMode has a non-null FloatingToolbar." into oc-dev
am: 76ec0575bc

Change-Id: If1353fcbfc97a752bec758763caf1188b8c0daa3
2017-05-23 16:05:15 +00:00
TreeHugger Robot
7c4998e614 Merge "Fix FloatingToolbar refresh on menu changes." into oc-dev 2017-05-23 16:01:37 +00:00
TreeHugger Robot
76ec0575bc Merge "Ensure FloatingActionMode has a non-null FloatingToolbar." into oc-dev 2017-05-23 15:57:49 +00:00
Wale Ogunwale
2c0dfb74a6 Merge "Revert "Changed alert window notifications to use single channel"" into oc-dev
am: 540cb28c5a

Change-Id: I188f1e181ff7feab8d1da92f6ef72ac43d47719c
2017-05-23 03:38:03 +00:00
TreeHugger Robot
540cb28c5a Merge "Revert "Changed alert window notifications to use single channel"" into oc-dev 2017-05-23 03:32:43 +00:00
Wale Ogunwale
af38fd7b0f Revert "Changed alert window notifications to use single channel"
This reverts commit 8f7bebca36.

We now want multiple channels so the user can disable which ever ones they like.

Change-Id: I6015cd5f1e3f37a8a01e1db42b57a94087780304
Fixes: 38428796
Bug: 37422870
2017-05-23 01:43:59 +00:00
Sudheer Shanka
7c1598d5e8 Merge "Read cpu freq data only when needed." into oc-dev
am: fdeb6b8ed3

Change-Id: I241535a379b8e3cf547d73c05fe0dc7298ccc958
2017-05-23 00:20:34 +00:00
Sudheer Shanka
fdeb6b8ed3 Merge "Read cpu freq data only when needed." into oc-dev 2017-05-22 23:52:02 +00:00
Abodunrinwa Toki
46850fcaea Fix FloatingToolbar refresh on menu changes.
Also includes some minor code clean ups.

Fixes: 38465735
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
bit CtsWidgetTestCases:android.widget.cts.TextViewTest

Change-Id: Ie87cc256b77b3ec5732f49c000ce4845130fc91c
2017-05-22 23:56:03 +01:00
Abodunrinwa Toki
17293cc8a2 Ensure FloatingActionMode has a non-null FloatingToolbar.
Test: none
Bug: 38472422
Change-Id: I8b1844e0cbbff6dedeb0a89536a4bc27535b56df
2017-05-22 14:16:04 +01:00
Sudheer Shanka
671985f483 Read cpu freq data only when needed.
Bug: 34133340
Test: cts-tradefed run singleCommand cts-dev -m ctsIncidentHostTestCases -t \
      com.android.server.cts.BatteryStatsValidationTest

Change-Id: Ib235e166820b95b5cd0a496b6146ea353abdf844
2017-05-19 17:09:48 -07:00
Adam Bookatz
95cf947fba Merge "Cumulative wakelock time per uid" into oc-dev
am: 1effe000b8

Change-Id: I475ced78c13cadd48ba3be70d680a4a3fa83e500
2017-05-19 18:32:20 +00:00
Adam Bookatz
1effe000b8 Merge "Cumulative wakelock time per uid" into oc-dev 2017-05-19 18:24:44 +00:00
Jorim Jaggi
c907b736a9 Merge "Fix underdraw during resizing" into oc-dev
am: 906fe92759

Change-Id: I25fe2b06324f238d2d5d6092837919d1f5659bf3
2017-05-19 15:53:18 +00:00
Jorim Jaggi
906fe92759 Merge "Fix underdraw during resizing" into oc-dev 2017-05-19 15:42:51 +00:00
Jorim Jaggi
853d17d838 Fix underdraw during resizing
Since we hide the navigation bar background during resizing, we
need to fill it with the fallback background.

This was always an issue but somehow in OC we are displaying
garbage instead of black.

Test: Open Contacts/Dialer, resize, make sure no underdraw is
happening. Also test a couple of other apps.
Fixes: 36206155

Change-Id: I6b02060ef4acf36c2529d49063a61034f9261696
2017-05-19 14:53:55 +02:00
Sudheer Shanka
1768a0054d Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev
am: aff7c3c71e

Change-Id: Ie7691a19ef61668afd9200c9a3c77fa9fc5368f1
2017-05-18 17:53:28 +00:00
Sudheer Shanka
aff7c3c71e Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev 2017-05-18 17:42:17 +00:00
Selim Cinek
29260fd33b Merge changes I858017b8,Ife32b600 into oc-dev
am: 63e8bfe1c5

Change-Id: Ib280d1e343d5765ea93edcfbc5aae21417e6c590
2017-05-17 16:09:50 +00:00
Selim Cinek
63e8bfe1c5 Merge changes I858017b8,Ife32b600 into oc-dev
* changes:
  Improved the media color extraction algorithm
  Fixed broken coretests
2017-05-17 15:59:07 +00:00
Andreas Gampe
52fe51d8b0 Merge "Zygote: Allow arbitrary-length wrap property names" am: 11780f1ad3 am: c942ae61e9
am: 85c5e1c123

Change-Id: Id599b6c108b656932343209eb29abb3837b15624
2017-05-16 21:19:16 +00:00
Bookatz
c8c44960c0 Cumulative wakelock time per uid
Currently, the time for each partial wakelock was tracked. If one
wants the total time that a uid held partial wakelocks (over all of its
wakelocks), they could sum over all the uid's partial wakelock
totalTimes, but this would underestimate the value because totalTimes
are pooled amongst all uids. Alternatively, they could sum over all the
uid's partial wakelock totalDurations, but this would overestimate the
value because totalDurations are not pooled within the uid (so there
will be double-counting if two wakelocks are held simultaneously). This
cl adds a new timer that specifically tracks the actual total time that
the uid spent holding wakelocks, and also provides the ability to see
how much time the uid was in the background when doing so.

Bug: 38198272
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java

Change-Id: I20ea3546338c44ffdf06859bc840d9059fb18321
2017-05-16 14:01:28 -07:00
Andreas Gampe
4c88a8c684 Zygote: Allow arbitrary-length wrap property names
The restriction on system property key length has been lifted.
Update the invoke-with code to first check the full-length property.
Then fall back to the truncated version for backwards-compatibility.

Test: m
Test: manual with long package name (Maps)
Change-Id: I9f714af093a6017307cfef18c84de769f0de7c3e
2017-05-15 19:51:29 -07:00
Sudheer Shanka
59f5c00b41 More unit tests for classes needed in reading uid times per cpu freq.
Bug: 34133340
Test: runtest -c com.android.internal.os.LongSamplingCounterArrayTest frameworks-core
      runtest -c com.android.internal.os.KernelUidCpuFreqTimeReaderTest frameworks-core
Change-Id: I4c64efd9b3d91a72c585b9e4b0e6b277297005a4
2017-05-15 19:07:37 -07:00
Wale Ogunwale
33c831a15c Merge "Changed alert window notifications to use single channel" into oc-dev
am: 648e127fcb

Change-Id: I0afd77da2da1c7e14cec98be39bcd595ec69267e
2017-05-15 22:34:59 +00:00
TreeHugger Robot
648e127fcb Merge "Changed alert window notifications to use single channel" into oc-dev 2017-05-15 22:25:43 +00:00
Wale Ogunwale
8f7bebca36 Changed alert window notifications to use single channel
Per UX request.

Change-Id: Iefe1be52743519af5ee1481b59613c87f16bdf7d
Fixes: 37422870
Test: Verify alert window notification channel.
2017-05-15 13:08:23 -07:00
Selim Cinek
6ce7cf7cda Fixed broken coretests
The MessagingLinearLayout and the ImageFloatingTextView tests were
broken.

Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/widget/MessagingLinearLayoutTest.java
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/widget/ImageFloatingTextViewTest.java
Change-Id: Ife32b600e2082400a8ee2f86310a51fd88c1b80c
Fixes: 38182087
2017-05-15 12:05:56 -07:00
Amith Yamasani
5cd7bd118e Merge "Map isolated processes to correct uid" into oc-dev
am: ba4ac09d23

Change-Id: I44e106b59854a12d8f871cbf595574a4b345dd4a
2017-05-15 17:44:46 +00:00
Amith Yamasani
ba4ac09d23 Merge "Map isolated processes to correct uid" into oc-dev 2017-05-15 17:36:36 +00:00
Sumir Kataria
3912511db2 Merge "Use placeholderCount-1 if using default layout." into oc-dev
am: 260d6c6e8c

Change-Id: Ie4ec53faee984a427e4e175255794a668e02b2a6
2017-05-15 16:45:57 +00:00
Sumir Kataria
260d6c6e8c Merge "Use placeholderCount-1 if using default layout." into oc-dev 2017-05-15 16:35:32 +00:00
Paul Duffin
4455130610 Moved c.a.i.u.Predicate[s] into legacy-test
These classes are only used by android.test classes that are
being removed. As their name suggests they should not be in the
Android API at all so it makes sense to remove them. Especially
as there is java.lang.function.Predicate available now.

It appears as though Predicate was only added in to the API
because it was used by a method in the API as the directory in
which it and Predicates live was not on the list of classes to
explicitly index. Moving it into legacy-test meant that they are
now being indexed explicitly which means that Predicates needs
to be hidden.

Keeps running the tests as part of the existing target.

At runtime apps targeted at the API version before these are
removed will have the legacy-test library automatically added
to their classpath so they should see no effect. Apps that
target a later API will have to include those classes from the
android.legacy.test.jar which will contain all the android.test
classes that depend on it as well.

Bug: 30188076
Test: make checkbuild
Change-Id: Ia8502ec77ac11f85e078d70b68df214a9435eee7
Merged-In: I6f6f5f16fe93bd80227a450c6254166632fc6813
2017-05-15 15:17:48 +01:00
Peeyush Agarwal
59817588f6 Fix broken MenuItem coretests
am: 101ab58e26

Change-Id: I5fa8da7c7455aa1e72924ea04d8e43580ed69765
2017-05-15 14:07:20 +00:00
Peeyush Agarwal
101ab58e26 Fix broken MenuItem coretests
- Fix MenuItemImpl setShortcut bug caused when method signature was
changed after API review
- Remove outdated MenuItem coretests and move others to CTS

Bug: 38114634
Test: Run `cts-tradefed run cts-dev -m CtsViewTestCases -t
android.view.cts.MenuTest`

Change-Id: Iebb7e314cbb3f812fcfeb3f95797f1cf1bcfbae2
(cherry picked from commit d70d2e6efc)
2017-05-15 13:56:59 +00:00
Paul Duffin
e5573b54cb Merge "Moved c.a.i.u.Predicate[s] into legacy-test" into oc-dev-plus-aosp 2017-05-15 10:44:55 +00:00
Amith Yamasani
8ee74aa3ba Map isolated processes to correct uid
This was missed in a recent addition to track cpu times at freq.

Bug: 34133340
Test: manual
Change-Id: Ie3720a76a1201c787601bb7419cb9eba47b2aa27
2017-05-12 17:30:12 -07:00
Selim Cinek
02f135e8b2 Merge "Fixed an issue where the media notification wouldn't have contrast" into oc-dev
am: 0ac4b7d108

Change-Id: If9ece630645f4ebd3e1ee9e62ed2490d32e21082
2017-05-12 23:56:15 +00:00
Selim Cinek
0ac4b7d108 Merge "Fixed an issue where the media notification wouldn't have contrast" into oc-dev 2017-05-12 23:42:49 +00:00
Bookatz
78ae8e0436 Merge "Batterystats BLE results counter takes in count" into oc-dev
am: 80fc1af120

Change-Id: I5b88079ab4bbefbc3e838e3ee8f90bfa961b0650
2017-05-12 22:02:10 +00:00
TreeHugger Robot
80fc1af120 Merge "Batterystats BLE results counter takes in count" into oc-dev 2017-05-12 21:57:18 +00:00
Sudheer Shanka
3ae1662024 Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev
am: 5df9c5570e

Change-Id: Ia15bc54c61a692a37ad9b84a28643afc798b52c7
2017-05-12 18:09:36 +00:00
Sudheer Shanka
5df9c5570e Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev 2017-05-12 18:02:43 +00:00
Selim Cinek
389edcd7c5 Fixed an issue where the media notification wouldn't have contrast
Because we were relying on the output to go in the right direction
already, this could be wrong. We're now only following the given
lightness direction if it is even possible to satisfy contrast.

Test: runtest -x core/tests/coretests/src/android/app/NotificationTest.java
Change-Id: I06d934a6b5c328ebbf0cf707030b0d707ccb5ab4
Fixes: 38182819
2017-05-12 10:06:41 -07:00
Bookatz
4ebc064c30 Batterystats BLE results counter takes in count
There would likely be too many BLE scan result calls for batterystats to
be healthy. Therefore, the caller can supply a count by which to increase the
counter, instead of doing it one result at a time.

Bug: 37720787
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: Ib8b2e8d250036be24c6c3dac477bc8d34fe498a6
2017-05-12 09:00:20 -07:00
Paul Duffin
f71d5b5b18 Moved c.a.i.u.Predicate[s] into legacy-test
These classes are only used by android.test classes that are
being removed. As their name suggests they should not be in the
Android API at all so it makes sense to remove them. Especially
as there is java.lang.function.Predicate available now.

It appears as though Predicate was only added in to the API
because it was used by a method in the API as the directory in
which it and Predicates live was not on the list of classes to
explicitly index. Moving it into legacy-test meant that they are
now being indexed explicitly which means that Predicates needs
to be hidden.

Keeps running the tests as part of the existing target.

At runtime apps targeted at the API version before these are
removed will have the legacy-test library automatically added
to their classpath so they should see no effect. Apps that
target a later API will have to include those classes from the
android.legacy.test.jar which will contain all the android.test
classes that depend on it as well.

Bug: 30188076
Test: make checkbuild
Change-Id: I6f6f5f16fe93bd80227a450c6254166632fc6813
2017-05-12 15:35:11 +01:00
Amin Shaikh
ef8d59b631 Merge changes from topic 'onarevert' into oc-dev
am: fa0b28220b

Change-Id: I744b3dd5c4b58042e1460f161c2813f34784dc32
2017-05-12 06:46:27 +00:00
TreeHugger Robot
fa0b28220b Merge changes from topic 'onarevert' into oc-dev
* changes:
  Create a NotificationChannel for ONA.
  Revert "Delete old WifiNotificationController strings."
2017-05-12 04:40:26 +00:00
Adam Lesinski
c041ea726c Merge "BatteryStats: Stop reading kernel memory stats when unvailable" into oc-dev
am: 120d7b219d

Change-Id: Ib408bed1686392f6bd846071277ac29cc70d54e7
2017-05-12 04:01:26 +00:00