Commit Graph

392720 Commits

Author SHA1 Message Date
Evan Laird
4bf21dffaa Add estimated time remaining text to QS
- Add an API to BatteryController to get an estimated time remaining
string.
- BatteryController will now check up to once per minute what the
estimated time will be and builds the string using PowerUtil.
- If the "show percentage" setting is on, the estimated time remaining
string (and battery icon) will show next to the system icons in QS
- Also make the battery percent in QS obey the setting

Test: visual
Bug: 116481529
Change-Id: Iaafa00127c8b8baae40956254a1237c8b7ac079b
2018-11-13 10:47:14 -05:00
TreeHugger Robot
b513876655 Merge "Camera: Enhance support for monochrome camera" 2018-11-13 15:27:10 +00:00
Wale Ogunwale
99b5308dca Merge "Expose display ID related APIs for use by CTS" 2018-11-13 15:04:59 +00:00
Paul Duffin
6cf46ea6fe Merge "Re-add light-greylist entries incorrectly removed with icu entries" am: e6e6968081 am: 8c265bf5a7
am: 8a637bb01a

Change-Id: Ieb5d07f1c7afda4db2ef72c202ffc9b275b1d15f
2018-11-13 06:57:03 -08:00
Paul Duffin
8a637bb01a Merge "Re-add light-greylist entries incorrectly removed with icu entries" am: e6e6968081
am: 8c265bf5a7

Change-Id: Iabb7fb1fabab8eb1a67e09870b856367140d8ca1
2018-11-13 06:47:22 -08:00
Aaron Heuckroth
40249d96a0 Merge "Ignore NotificationSwipeHelperTests for now, to avoid flakiness." 2018-11-13 14:41:55 +00:00
Paul Duffin
8c265bf5a7 Merge "Re-add light-greylist entries incorrectly removed with icu entries"
am: e6e6968081

Change-Id: Ied2a041b14d087089a3faeffa5f4a586f30adcea
2018-11-13 06:40:30 -08:00
Treehugger Robot
e6e6968081 Merge "Re-add light-greylist entries incorrectly removed with icu entries" 2018-11-13 14:22:17 +00:00
Fabian Kozynski
ab96fe0b43 Merge "Separates logic from Chip. Chip is notch-aware." 2018-11-13 14:03:25 +00:00
Anton Hansson
4a08723c5f Merge "Make Environment.getProductDirectory() @TestApi" 2018-11-13 12:53:07 +00:00
TreeHugger Robot
504fdabba9 Merge "Move native process memory state pulling code" 2018-11-13 12:12:44 +00:00
TreeHugger Robot
1b34837e69 Merge "Add get/setExtras to TextLinks and TextSelection" 2018-11-13 12:09:42 +00:00
Tony Mak
916bb9e37e Add get/setExtras to TextLinks and TextSelection
Test: atest frameworks/base/core/tests/coretests/src/android/view/textclassifier/TextSelectionTest.java
Test: atest frameworks/base/core/tests/coretests/src/android/view/textclassifier/TextLinksTest.java
Test: atest cts/tests/tests/view/src/android/view/textclassifier/cts/TextClassifierValueObjectsTest.java

BUG: 118690735

Change-Id: I5786db40b24b38020514f96b1d642835c9a9db51
2018-11-13 12:09:22 +00:00
Dimitry Ivanov
36154fdb82 Merge "Apply version-script to libandroid library." am: dbacdb242b am: 5291def66d
am: f3fa150b77

Change-Id: I3f0673ce51177295fbd8985eea26888501548bcc
2018-11-13 03:32:18 -08:00
Dimitry Ivanov
f3fa150b77 Merge "Apply version-script to libandroid library." am: dbacdb242b
am: 5291def66d

Change-Id: I46294a75b19f7e71c5e605d39c5cf32ae7af0890
2018-11-13 03:21:46 -08:00
TreeHugger Robot
9005dafb74 Merge "Implements TextClassifierImpl.suggestConversationActions" 2018-11-13 11:14:08 +00:00
Tony Mak
adbebcc634 Implements TextClassifierImpl.suggestConversationActions
TODO: Construct RemoteAction for contextual actions.
TODO: Map Person object to user id.
TODO: Consider to use LangID to infer the locale. And get a new model when locale is changed.

BUG: 111437455
BUG: 111406942

Test: atest ./core/tests/coretests/src/android/view/textclassifier/TextClassificationManagerTest.java

Change-Id: Id35066455918b3321fcd30df0ff215e30586a4b3
2018-11-13 11:12:40 +00:00
Dimitry Ivanov
5291def66d Merge "Apply version-script to libandroid library."
am: dbacdb242b

Change-Id: Ib96a20b93d0e8140e406809709944200693ef1ae
2018-11-13 03:08:28 -08:00
Dimitry Ivanov
dbacdb242b Merge "Apply version-script to libandroid library." 2018-11-13 10:53:18 +00:00
Remi NGUYEN VAN
bda37423d4 Merge "Fix LingerMonitor notification rate limiting" am: 075e5deba1 am: c1196355c1
am: 12b8fd0b29

Change-Id: I1cdc817a27b7e966837d9c56f7e93b8bc917c6c0
2018-11-13 02:12:51 -08:00
Junyu Lai
faaaf80908 Merge "Change types of fields of network stats reported to framework." am: 2c0a0092f1 am: c53ca081d4
am: 1b77ce4858

Change-Id: Iab166b8b06d3a744b8cfc83e0467c478642ce185
2018-11-13 02:03:05 -08:00
Remi NGUYEN VAN
12b8fd0b29 Merge "Fix LingerMonitor notification rate limiting" am: 075e5deba1
am: c1196355c1

Change-Id: I17b180a7dc2d06c54d4a6282414b818b83ecdfdc
2018-11-13 01:59:56 -08:00
Junyu Lai
1b77ce4858 Merge "Change types of fields of network stats reported to framework." am: 2c0a0092f1
am: c53ca081d4

Change-Id: I0bf2bdc56f46928b94f0954e799d51196171fdc4
2018-11-13 01:53:45 -08:00
Remi NGUYEN VAN
c1196355c1 Merge "Fix LingerMonitor notification rate limiting"
am: 075e5deba1

Change-Id: I68800c06e8d4413b2e46176a12dc60b436277653
2018-11-13 01:46:21 -08:00
Junyu Lai
c53ca081d4 Merge "Change types of fields of network stats reported to framework."
am: 2c0a0092f1

Change-Id: I82da681df48cd6425bbfb962d3969fa236e9db29
2018-11-13 01:37:17 -08:00
Treehugger Robot
075e5deba1 Merge "Fix LingerMonitor notification rate limiting" 2018-11-13 09:36:39 +00:00
TreeHugger Robot
c09f4ee42e Merge "Implement LocalMediaManager for seamless transfer" 2018-11-13 09:25:18 +00:00
Junyu Lai
2c0a0092f1 Merge "Change types of fields of network stats reported to framework." 2018-11-13 09:15:37 +00:00
TreeHugger Robot
1e15d4e5ca Merge "MediaPlayer2: clean up more code" 2018-11-13 08:48:36 +00:00
Xiangyu/Malcolm Chen
ea0fb2dbcc Merge "Fix mis-ordered merge in PhoneStateListener.java" am: a97bdb957f am: d57e403dd0
am: 322e77d3d1

Change-Id: If79bf6eff63fe2ca430a73835388e441bebbbb7f
2018-11-12 23:22:35 -08:00
Xiangyu/Malcolm Chen
322e77d3d1 Merge "Fix mis-ordered merge in PhoneStateListener.java" am: a97bdb957f
am: d57e403dd0

Change-Id: I7759d933eae873879a5e3677397baebd1c356747
2018-11-12 23:07:47 -08:00
Jeff Tinker
ac91c6eb47 Merge "Add new offline management APIs to MediaDrm" 2018-11-13 07:03:35 +00:00
Xiangyu/Malcolm Chen
d57e403dd0 Merge "Fix mis-ordered merge in PhoneStateListener.java"
am: a97bdb957f

Change-Id: Ie081fa88a754fe79fa6466781d8c88a53e8452b6
2018-11-12 22:58:53 -08:00
Chen Xu
140aaadabb Merge "support parent carrier id" am: 00496a1181 am: eb45abb8aa
am: d7daccbfc0

Change-Id: Id0e5a0312dd42b90bd36513f912d5073069dd9bd
2018-11-12 22:58:47 -08:00
Chen Xu
d7daccbfc0 Merge "support parent carrier id" am: 00496a1181
am: eb45abb8aa

Change-Id: I117ec195fa3deb381273e707fadcb059f99771ce
2018-11-12 22:42:58 -08:00
Xiangyu/Malcolm Chen
a97bdb957f Merge "Fix mis-ordered merge in PhoneStateListener.java" 2018-11-13 06:38:50 +00:00
Tim Murray
1f7819716f Merge "ActivityManagerService: split low mem computation into a function" 2018-11-13 06:35:32 +00:00
Chen Xu
eb45abb8aa Merge "support parent carrier id"
am: 00496a1181

Change-Id: Ifdb44efdfbeecd6db8841c6de3f38e40a7e9566b
2018-11-12 22:31:32 -08:00
Chen Xu
00496a1181 Merge "support parent carrier id" 2018-11-13 06:08:46 +00:00
Amit Mahajan
b608ad49f9 Merge "Define new intent ACTION_LINE1_NUMBER_ERROR_DETECTED" 2018-11-13 05:46:26 +00:00
Lucas Dupin
f23baceca0 Merge "Do not block main thread to register debug hook" 2018-11-13 05:45:56 +00:00
Lucas Dupin
5968855ad6 Do not block main thread to register debug hook
Test: atest DozeScreenBrightness
Fixes: 118935318
Change-Id: Ib06e33c59e175ffbe4a4cd3d66450506d8670cb8
2018-11-13 05:45:47 +00:00
Tiger Huang
fc2184596e Expose display ID related APIs for use by CTS
For CtsWindowManagerDeviceTestCases:WindowFocusTests

Bug: 111361570
Test: atest WindowFocusTests android.view.cts.KeyEventTest
Change-Id: I273120f71f42d2eaa52786b4a350f3c099d11989
2018-11-13 13:38:23 +08:00
TreeHugger Robot
8ed0d053f7 Merge "Implement MediaDevice for seamless transfer" 2018-11-13 04:54:29 +00:00
andychou
87fd39b724 [automerger skipped] Merge "Add PreciseDisconnectCause for SIP status code 481 Transaction Does Not Exist" am: 36ac46a915 am: b4ce0e3f2e
am: c9e506a2d1  -s ours

Change-Id: I9e726a2e86b7d85cde5aebe49dd40c3250d9485b
2018-11-12 20:37:07 -08:00
andychou
c9e506a2d1 Merge "Add PreciseDisconnectCause for SIP status code 481 Transaction Does Not Exist" am: 36ac46a915
am: b4ce0e3f2e

Change-Id: I0b57d71afa81ea671403b36e7d797eeb7ed675b1
2018-11-12 20:23:38 -08:00
TreeHugger Robot
c59a28bd16 Merge "Dragging hit target over nav bar is bounded by its window (1/2)" 2018-11-13 04:17:45 +00:00
TreeHugger Robot
3f9115a4e3 Merge "Revert "Export profileableFromShellFlag in /data/system/packages.list."" 2018-11-13 04:17:26 +00:00
TreeHugger Robot
8a03aa877a Merge "Use double-digit hour on 24h alarm format" 2018-11-13 04:15:25 +00:00
mtk33169
7d95b92bf6 Merge "The JE about "android.process.media" will pop up when you eject the SD card after you set SD as internel phone storage" am: 83269acba7 am: a10effa6d4
am: 51a8342f5f

Change-Id: If85027b1fe54aca707906f93ac231f723815d34b
2018-11-12 20:14:47 -08:00