227654 Commits

Author SHA1 Message Date
Adrian Roos
245aa87f3f Even more Inline Reply goodness
- Removed action icon processing
- Correct color for action label
- Change default notification color to Gray 600
- Handle different states in RemoteInputView
- Handle updates to Notifications with active remote input

Bug: 22452379
Change-Id: I30a0cd917dbf814f156ab5a106e018a245d99b67
2015-12-10 17:04:32 -08:00
Filip Gruszczynski
1c7de3737c Merge "Fix activity not launching from recents after it was dismissed." 2015-12-11 00:31:16 +00:00
Prashant Malani
4eaa942356 Merge "Remove hide annotation from AXIS_SCROLL" 2015-12-11 00:21:16 +00:00
Christopher Tate
2fcbe218a6 Use direct alarm callbacks instead of broadcasts in the job scheduler
No more broadcasts needed for deadline/delay tracking!

Bug 26114467

Change-Id: Ie5b1cc8eecfe9caf7d82ec6b84ac56057e4586c6
2015-12-11 00:14:53 +00:00
Adam Lesinski
794a18f5a2 Prevent DivideByZero error in BatteryStatsImpl am: ba88e68fe4 am: 4e4ff058c1
am: 0b754d122c

* commit '0b754d122c3b9db395a86d9a098f6a29bf042b53':
  Prevent DivideByZero error in BatteryStatsImpl
2015-12-10 15:44:14 -08:00
Selim Cinek
65fd3fecf0 Merge "Fixed a bug where the group overflow was invisible" 2015-12-10 23:19:36 +00:00
Prashant Malani
04b4819fcf Remove hide annotation from AXIS_SCROLL
Bug: 22836852
Bug: 18707397
Change-Id: I77ec72cf577cb68782b9954f4d40845d723a7685
2015-12-10 15:09:45 -08:00
Adam Lesinski
0b754d122c Prevent DivideByZero error in BatteryStatsImpl am: ba88e68fe4
am: 4e4ff058c1

* commit '4e4ff058c1a0b4b77f468a206a790bb6f084f616':
  Prevent DivideByZero error in BatteryStatsImpl
2015-12-10 14:54:38 -08:00
Adam Lesinski
4e4ff058c1 Prevent DivideByZero error in BatteryStatsImpl
am: ba88e68fe4

* commit 'ba88e68fe47b66f1fc5d10c15f04f20fe662399e':
  Prevent DivideByZero error in BatteryStatsImpl
2015-12-10 14:47:09 -08:00
Adam Lesinski
0165523237 Merge "AAPT: Dump uses-permission-sdk-23" 2015-12-10 22:36:29 +00:00
Tom Hudson
58862c9f6f Fix leak of file descriptors in test code
skia_dm rendering through HWUI was hanging after roughly 300 tests.
logcat reports some process was unable to get any file descriptors.

When we migrated TestWindowContext into HWUI and started using PIMPL
I didn't clean up the implementation struct in the destructor. Doing
so solved the hang for me.

My guess was that BufferQueue was being leaked, and that gralloc is
backed by file descriptors, but some research suggests that Android
ought to be able to handle far more than 1k fds (ulimit -Hn returns
4096 on this device).

R=djsollen@google.com

Change-Id: I2cd9f8945cee9b22f838002e1ad687d5fe29cb97
2015-12-10 22:19:17 +00:00
Adam Lesinski
5f3b2ecb3e AAPT: Dump uses-permission-sdk-23
Include <uses-permission-sdk-23> permissions in dump badging and dump permissions.

This will also add implied features for that permission, marked as -sdk-23 features.

Ex:

uses-permission: name='android.permission.ACCESS_FINE_LOCATION'
uses-permission-sdk-23: name='android.permission.CAMERA'

feature-group: label=''
  uses-feature: name='android.hardware.location'
  uses-implied-feature: name='android.hardware.location' reason='...'
  uses-feature-sdk-23: name='android.hardware.camera'
  uses-implied-feature-sdk-23: name='android.hardware.camera' reason='...'

Bug:24939655
Change-Id: Ifb374696ed4760b0ba2f1cc3516f3bf08e6cb6a3
2015-12-10 14:17:52 -08:00
Selim Cinek
2108fe0d6d Fixed a bug where the group overflow was invisible
Change-Id: I6e43decc9d68dbf869245ee99b80f4d5c9ae4456
2015-12-10 13:51:38 -08:00
Matthew Williams
605b869a36 Merge "Merge commit '1db19fc70e24bc5e3c6d77f2b9a5374c372e46cd' into manual_merge_1db19fc70e" 2015-12-10 21:28:02 +00:00
Felipe Leme
25c2ebc107 Merge "Added test annotation." 2015-12-10 20:49:53 +00:00
Selim Cinek
fe3b82ced5 Merge "Revert "Fixed a bug where the panel could be too small in certain cases"" 2015-12-10 20:45:52 +00:00
Chris Craik
a38b75b095 Merge "Add property animations to new reorderer/renderer" 2015-12-10 20:43:56 +00:00
Felipe Leme
2bfa0858a8 Added test annotation.
BUG: 25752530
Change-Id: Ia84233371481be89b1c9c852dfbb990020f0e6c0
2015-12-10 12:43:31 -08:00
Selim Cinek
e14ab3c646 Revert "Fixed a bug where the panel could be too small in certain cases"
This reverts commit c349c3d43bd59ff22a638bded955594bd765fc26.

Change-Id: I76a41db987027128294b4e398af9564a8e2aaa05
2015-12-10 20:39:16 +00:00
Matthew Williams
a474554fe6 Merge commit '1db19fc70e24bc5e3c6d77f2b9a5374c372e46cd' into manual_merge_1db19fc70e
Change-Id: I8f997804d17ac7635b0dd4aa9cad79334c19eb61
2015-12-10 20:33:36 +00:00
Greg Hackmann
5a86c99d88 Merge "Return long long from get_zram_mem_used()" 2015-12-10 20:23:22 +00:00
Dianne Hackborn
0c6cc308cf Merge "Add new target SDK filtering feature to BroadcastOptions." 2015-12-10 20:13:29 +00:00
Dianne Hackborn
e0e413e2b1 Add new target SDK filtering feature to BroadcastOptions.
You can now control the range of target SDKs that receivers
will be need to have in order to receive your broadcast.

Use this for CONNECTIVITY_ACTION to not allow N+ applications
to receive these broadcasts through their manifest.

Also tweak the broadcast debug output code to now include the
disposition of each receiver in the list.  This is becoming
important as skipping receivers is becoming a more common
thing to have happen.

Change-Id: I251daf68575c07cbb447536286ab4e68b7015148
2015-12-10 12:12:00 -08:00
Mindy DelliCarpini
6ec3e4c56b Merge "Add quick settings permission to system ui" 2015-12-10 19:26:33 +00:00
Mindy Pereira
a59301a44e Add quick settings permission to system ui
Makes it possible to use the new quick settings api from:
I82b6bebb0b21a5c9eb926cb1a761cac340a293df

Change-Id: I053bb2b28284c4f49d67339b617ef72ede1f2843
2015-12-10 19:25:08 +00:00
Chris Craik
268a9c0f29 Add property animations to new reorderer/renderer
bug:22480459

Change-Id: Id8091038004245a56deb48bf3625edfd08ab8681
2015-12-10 11:09:27 -08:00
Adam Lesinski
940cfe3277 Merge "Use Android.mk to specify private symbol package name" 2015-12-10 19:01:22 +00:00
Filip Gruszczynski
3d82ed6be6 Fix activity not launching from recents after it was dismissed.
When activity was launched from recents and started at the same time, we
would first try resuming activities and then focus on the started
activity. That is wrong odering, as the previously focused activity will
be resumed (in this case recents). We need to first focus on the start
activity and then request resuming.

The CL also flag protects some logging that is being very frequently
printed from activity manager.

Bug: 25823213
Change-Id: I5311fb2bf316ce3d298b30fa90fb257978bacdca
2015-12-10 10:41:39 -08:00
Ritesh Reddy
4d4f0db8d9 Merge changes I2363e66a,If17effb9
* changes:
  Enabled NetworkPolicy backup and restore.
  Enabled SoftAP Configuration Backup
2015-12-10 18:38:42 +00:00
Matthew Williams
1db19fc70e Merge "ConcurrentModificationException in SyncManager"
am: 7e4d92fbc7

* commit '7e4d92fbc7761d561c1bc61dc5cf55b69d3a54f3':
  ConcurrentModificationException in SyncManager
2015-12-10 10:16:19 -08:00
Matthew Williams
7e4d92fbc7 Merge "ConcurrentModificationException in SyncManager" 2015-12-10 18:04:44 +00:00
Daniel Sandler
0a6ff35a8b Merge "Remove more extras during notification lightening." 2015-12-10 17:59:43 +00:00
Yohei Yukawa
ac0ec1b020 Merge "Use BCP-47 LanguageTag in IME/Spell-Checker." 2015-12-10 17:45:18 +00:00
Ben Kwa
696f6da4a1 Merge "Fix selection highlights." 2015-12-10 17:21:55 +00:00
Dan Sandler
5012853de2 Remove more extras during notification lightening.
Basically anything Parcelable needs to go since it might be
quite large. Note that this includes additional extras such as
those contributed by WearableExtender.

Bug: 26038546
Change-Id: I85a20173158717c866a36dacd6a04391c2a33376
2015-12-10 16:25:20 +00:00
Felipe Leme
3b9cac0dc7 Merge "Protect android.intent.action.BUGREPORT_STARTED." 2015-12-10 16:23:03 +00:00
Ritesh Reddy
9f548b00dc Enabled NetworkPolicy backup and restore.
Backing up NetworkPolicy through NetworkPolicyManager API

Bug: 17857156
Change-Id: I2363e66a1b27f50b2454b4550a241a3d84bf4b7c
2015-12-10 16:21:18 +00:00
Jason Monk
ec9af01df5 Fix default QS tiles
Also add emergency only to header.

Bug: 26124044
Change-Id: If39fa2cca052b711516bd5a92a91f541ad00e62a
2015-12-10 11:10:23 -05:00
Lorenzo Colitti
bda01cc5e3 Fix canceling renew alarms.
1. Entering DhcpBoundState cancels the renew alarm, but at that
   point the renew alarm is guaranteed not to have been scheduled.
   This is harmless, but results in an "unknown listener" message
   in the AlarmManager logs.
2. We don't cancel the renew alarm when exiting DhcpBoundState.
   This is also harmless, because that alarm does nothing except
   in DhcpBoundState, and we cancel it whenever we enter
   DhcpBoundState. But canceling it on exit is more correct.

Change-Id: I60dfcf00f243253b81b8906540e0a6218a7a489c
2015-12-10 12:58:27 +00:00
Keisuke Kuroyanagi
ae3ecaa276 Merge "TextView test: floating toolbar + drag handle interaction." 2015-12-10 07:20:20 +00:00
Keisuke Kuroyanagi
d2441607bd Merge "TextView test: insertion handle movement tests." 2015-12-10 07:18:55 +00:00
Keisuke Kuroyanagi
ff37557795 Merge "Fix selection expansion detection logic." 2015-12-10 07:18:21 +00:00
Keisuke Kuroyanagi
155aecb18b Move double tap/triple click detection to Editor.
The logic was in TextView, but it's only for Editor.
Move it to Editor and have constants for the state.

Bug: 19544351
Change-Id: I391f66753aa5cbb26fbefcba5b4e7e3d917454e2
2015-12-10 06:41:10 +00:00
Keisuke Kuroyanagi
2b69da5183 Merge "TextView tests: Add mouse triple click tests." 2015-12-10 06:01:33 +00:00
Keisuke Kuroyanagi
4368d05af7 Triple click to start paragraph based selection.
- Detect triple click in TextView#onTouchEvent.
- Select paragraph on triple click.
- Extend drag accelerator to support paragraph based
selection.

Bug: 19544351
Change-Id: I0a6752a0642a2c569b69a1fc2c0f49169a72844a
2015-12-10 06:01:19 +00:00
Keisuke Kuroyanagi
b2ba0605ef Remove unneeded method HandleView#showAtLocation.
Now, the handles will be shown at the proper positions in
Editor#startSelectionActionMode. No need to call
HandleView#showAtLocation.

Change-Id: I5a7fb7bc4419a49234584bd06db5acc3d23168b8
2015-12-10 14:41:52 +09:00
Keisuke Kuroyanagi
3c5a52b424 Merge "TextView tests: tests for improved mouse text selection." 2015-12-10 05:14:11 +00:00
Keisuke Kuroyanagi
40329b8540 Merge "Move mouse selection handling logic to Editor." 2015-12-10 05:14:11 +00:00
Keisuke Kuroyanagi
97af673e1f Move mouse selection handling logic to Editor.
- Remove mouse selection related logic from
ArrowKeyMovementMethod and Touch.
- Extend drag accelerator to support character based
selection by dragging and use it for mouse drag selection.
- Enable word based drag accelerator even if the clicked
position is not on a word.
- Disable y-coordinate adjustment for word based drag
accelerator when the user is using a mouse.

Bug: 19544351

Change-Id: I1b29a65be3d321ac472f8c5b70ab6fee4e895964
2015-12-10 05:13:40 +00:00
Insun Kang
880677bdda Merge "MediaRouter: Add getDeviceType() to RouteInfo" 2015-12-10 02:57:29 +00:00