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

314589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jean-Michel Trivi
350b39fbc8 Merge "Fix A11y volume persisting/restore" into oc-dev 
am: 076a0bd0bf

Change-Id: Ida09a7781114812adbb4536fac53a3773cd69dc4
 2017-04-13 21:40:36 +00:00
Dongwon Kang
3d9ecc264d Merge "TIF: add helper methods for making a channel browsable." into oc-dev 
am: b2eb818a7d

Change-Id: I54b92c8b773706de49ffd2e78df59568e19d3b49
 2017-04-13 21:32:15 +00:00
Jean-Michel Trivi
076a0bd0bf Merge "Fix A11y volume persisting/restore" into oc-dev 2017-04-13 21:32:06 +00:00
Bookatz
53b7ff2014 Merge "Collect background stats: syncs" into oc-dev 
am: a8fc7bff5a

Change-Id: Id3f2d7b2a77c74657416e492519f2205bc46218a
 2017-04-13 21:31:05 +00:00
TreeHugger Robot
b2eb818a7d Merge "TIF: add helper methods for making a channel browsable." into oc-dev 2017-04-13 21:23:48 +00:00
TreeHugger Robot
a8fc7bff5a Merge "Collect background stats: syncs" into oc-dev 2017-04-13 21:20:14 +00:00
Jeremy Joslin
9bcbf38e79 Merge "Add more NetworkRecommendationProvider documentation." into oc-dev 
am: 5879aa4b03

Change-Id: I4e41346ea4dd9a731f8747c3e447deb0a991fc3d
 2017-04-13 21:04:53 +00:00
Adam Lesinski
b8dc42fcf3 Merge "Add example to TypedValue.changingConfigurations JavaDoc" into oc-dev 
am: 4124851b64

Change-Id: I2bdfbdbe4e08e4b10b0fe7a2d0ed813f29d72fe7
 2017-04-13 21:03:53 +00:00
TreeHugger Robot
5879aa4b03 Merge "Add more NetworkRecommendationProvider documentation." into oc-dev 2017-04-13 20:55:55 +00:00
TreeHugger Robot
4124851b64 Merge "Add example to TypedValue.changingConfigurations JavaDoc" into oc-dev 2017-04-13 20:54:30 +00: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
Adam Lesinski
f8235c3631 Merge "Update docs for obtainStyledAttribute" into oc-dev 
am: 80b7a214ba

Change-Id: I66c85d892d708176f2cef6a6ef2b698976d649c9
 2017-04-13 20:34:34 +00:00
Bryce Lee
a27128b8c7 Merge "Remove window container from empty task when destroying." into oc-dev 
am: 61bce9ab13

Change-Id: If4544085864f9fe40de4d2dd44ad4a880f79c43a
 2017-04-13 20:33:19 +00:00
TreeHugger Robot
d2b368a68d Merge "Fix location status bar icon" into oc-dev 2017-04-13 20:26:16 +00:00
Adam Lesinski
51d94c82af Merge "BatteryStats: Remove reading of cpu power" into oc-dev 
am: af85d84050

Change-Id: I671a51d53c035d40cb1af1428f7c0f4093445aed
 2017-04-13 20:22:19 +00:00
Jim Van Verth
c7fd8db8a6 Merge "Add uncached and perspective shadows to Skia renderer" into oc-dev 
am: 1be9766a68

Change-Id: I8034dff9695425939a00b3f38d06615ffcc0f2b4
 2017-04-13 20:16:17 +00:00
TreeHugger Robot
80b7a214ba Merge "Update docs for obtainStyledAttribute" into oc-dev 2017-04-13 20:15:51 +00:00
Dianne Hackborn
76c71a01e2 Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev 
am: 29c70437b3

Change-Id: I5078d76e3eb861850ef7af769badf81dbdee418a
 2017-04-13 20:15:05 +00:00
Jason Monk
cea904333e Merge "Fix leak in nav bar" into oc-dev 
am: 0b67d53ba9

Change-Id: I46aa7def6eb54f967ab568fc459786d0401055d3
 2017-04-13 20:13:55 +00:00
Shuo Qian
21d8d8095e Merge "ECBM SystemProperty cleanup" into oc-dev 
am: efb8882b47

Change-Id: I69e063bbb4c93f94d50c58a1c8af1643f5e024ca
 2017-04-13 20:11:41 +00:00
Bryce Lee
61bce9ab13 Merge "Remove window container from empty task when destroying." into oc-dev 2017-04-13 20:10:56 +00:00
Geoffrey Pitsch
aa8dcf3751 Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev 
am: c4ca1b5677

Change-Id: I81a50649ba59d28fdfc9a7b8381bcaf346555a3a
 2017-04-13 20:10:13 +00:00
Adam Lesinski
af85d84050 Merge "BatteryStats: Remove reading of cpu power" into oc-dev 2017-04-13 20:09:51 +00:00
Jack He
97164fe986 Merge "Add developer setting and system API for inband ringing support" into oc-dev 
am: aadf525e1a

Change-Id: I458b5df924ca65edc4b38ee1e275b6b6f86310fe
 2017-04-13 20:07:44 +00:00
Jim Van Verth
1be9766a68 Merge "Add uncached and perspective shadows to Skia renderer" into oc-dev 2017-04-13 20:01:47 +00:00
TreeHugger Robot
29c70437b3 Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev 2017-04-13 20:01:32 +00:00
Todd Kennedy
0bb486bcb4 Merge "Filter instant app content providers" into oc-dev 
am: 3891674204

Change-Id: I4e33d8e82a249249dfe25964cbfdb89b2f1e0318
 2017-04-13 19:59:28 +00:00
TreeHugger Robot
0b67d53ba9 Merge "Fix leak in nav bar" into oc-dev 2017-04-13 19:55:52 +00:00
TreeHugger Robot
efb8882b47 Merge "ECBM SystemProperty cleanup" into oc-dev 2017-04-13 19:53:14 +00:00
TreeHugger Robot
c4ca1b5677 Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev 2017-04-13 19:50:00 +00:00
Jason Monk
4520cb7ad9 Merge "Update mobile data icon" into oc-dev 
am: 99856429db

Change-Id: I1cb5f4e16f3832ff304894fac43eced6decd020d
 2017-04-13 19:46:47 +00:00
Chris Tate
636915a2ed Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev 
am: 117ac766a9

Change-Id: I9bec0f90873a5bcb9ff89eadcf7e334e9f0afb89
 2017-04-13 19:45:30 +00:00
Jack He
aadf525e1a Merge "Add developer setting and system API for inband ringing support" into oc-dev 2017-04-13 19:43:54 +00:00
TreeHugger Robot
3891674204 Merge "Filter instant app content providers" into oc-dev 2017-04-13 19:43:31 +00:00
Seigo Nonaka
17452ee553 Merge "Introduce setFallbackTypeface" into oc-dev 
am: 729a515e5e

Change-Id: I3e88a1d51b8a8be7f932964917218a28ae23c5c9
 2017-04-13 19:38:09 +00:00
TreeHugger Robot
99856429db Merge "Update mobile data icon" into oc-dev 2017-04-13 19:37:36 +00:00
Yu Liu
5303f33bdc Merge "Fix some issues came up from the reviews of the newly added APIs Test: Existing unit tests still pass. BUG: 36554361 Change-Id: I6c2dab2e0df7f8578f92c70907f45aa69909892c" into oc-dev 
am: e425b366ba

Change-Id: I371260b7a82bbda02f978c2396385c96fd03ec66
 2017-04-13 19:34:48 +00:00
Chris Tate
117ac766a9 Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev 2017-04-13 19:24:13 +00:00
TreeHugger Robot
729a515e5e Merge "Introduce setFallbackTypeface" into oc-dev 2017-04-13 19:21:25 +00:00
Yu Liu
e425b366ba Merge "Fix some issues came up from the reviews of the newly added APIs Test: Existing unit tests still pass. BUG: 36554361 Change-Id: I6c2dab2e0df7f8578f92c70907f45aa69909892c" into oc-dev 2017-04-13 19:21:03 +00:00
Daniel Sandler
dc4fd3c847 Merge "Quick fix to lockscreen text color." into oc-dev 
am: f06c2a01a5

Change-Id: If3ec3b915bb2defe9999b323bf7f7ce2c55ff7be
 2017-04-13 19:16:13 +00:00
Daniel Sandler
f06c2a01a5 Merge "Quick fix to lockscreen text color." into oc-dev 2017-04-13 19:06:28 +00:00
Jean-Michel Trivi
a53b7051a2 Fix A11y volume persisting/restore 
When the accessibility volume is enabled, its value wasn't persisted
  when changed because it was still using the persisting name from
  its alias (music).
When enabled, notiify the volume controller that a11y volume has
  changed so the UI also reflects the new value, now updated from
  the persisted settings.
Do not persist volumes for streams that don't have a setting name.

Test: enable Talkback, set a11y volume at a different level than media \
  then disable Talkback. Reboot and enable Talkback, verify a11y is \
  restored.
Bug: 36286073

Change-Id: Ic6c30364e164b856fc10fbf6b22c09a7b5561be1
 2017-04-13 12:04:15 -07:00
Bookatz
2bffb5bb3a Collect background stats: syncs 
Added background times and counts for an app's sync usage.

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

Change-Id: I1c01c5044064277b97e8d330386454da3e8204da
 2017-04-13 11:59:33 -07:00
Dan Sandler
0c9b9ae557 Quick fix to lockscreen text color. 
Bug: 37299706
Test: visual
Change-Id: Ide48186f0f1cb4a50c77b45ae8b80a79781d7b0d
 2017-04-13 14:50:30 -04:00
Daniel Nishi
57fb5872d1 Merge changes from topic 'cp-movies' into oc-dev 
am: ff97ea2eef

Change-Id: Ife4f6fb260439003a46e6510af41f8bb6c542cb7
 2017-04-13 18:44:53 +00:00