227626 Commits

Author SHA1 Message Date
Matthew Williams
a474554fe6 Merge commit '1db19fc70e24bc5e3c6d77f2b9a5374c372e46cd' into manual_merge_1db19fc70e
Change-Id: I8f997804d17ac7635b0dd4aa9cad79334c19eb61
2015-12-10 20:33:36 +00:00
Adam Lesinski
940cfe3277 Merge "Use Android.mk to specify private symbol package name" 2015-12-10 19:01:22 +00: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
Svetoslav Ganov
1030ca69a2 Merge "Avoid caller NPE if callback null in AppOpsService" 2015-12-10 02:26:33 +00:00
Svetoslav Ganov
8de5971ac6 Avoid caller NPE if callback null in AppOpsService
bug:25863432

Change-Id: Ib0386ed4c1637ff8b084f32592ba316b65498005
2015-12-09 18:25:18 -08:00
Felipe Leme
d7963806f1 Merge "Improved test case by checking for dangling service." 2015-12-10 02:03:06 +00:00
Filip Gruszczynski
ac7518854e Merge "Remaining APIs for freeform window caption." 2015-12-10 01:57:10 +00:00
Chris Tate
1353bdbdd5 Merge "Allow direct-callback alarms for non-wakeup alarms" 2015-12-10 01:18:14 +00:00
Christopher Tate
ff6390cda4 Allow direct-callback alarms for non-wakeup alarms
Turns out there are known use cases for it, in particular to avoid
interfering with doze/idle type optimizations.  In addition, it is
not reliably possible to aim for a specific *wall-clock* trigger time
when posting work to a Handler, since the time base used there is
uptime rather than elapsed.

Bug 26114467

Change-Id: I7cede733fc7e09704b63dfe3e98b00365bbdff35
2015-12-09 17:12:37 -08:00
Selim Cinek
6c24afe4b0 Merge changes from topic 'more_groups'
* changes:
  Fixed a bug where the heads up had the wrong size
  Adapted the appear animation for notification children
  Added darkmode for notification groups
  And suddenly notification children appeared
2015-12-10 00:58:21 +00:00
Svetoslav Ganov
6f176f70e6 Merge "Allow white-listed apps to change VIBRATE_WHEN_RINGING" 2015-12-10 00:35:09 +00:00
Svetoslav Ganov
d263163e4e Allow white-listed apps to change VIBRATE_WHEN_RINGING
We don't allows apps white-listed to write to system
settings to change settings that aren't a part of the
public APIs. Now that we made VIBRATE_WHEN_RINGING it
should be moved from the list of private settings to
the public list which apps can modify.

bug:25941020

Change-Id: Ice91f782aeca4785fa0aed300b22d9ecdbb51bd3
2015-12-09 16:29:28 -08:00
Selim Cinek
77019c7233 Fixed a bug where the heads up had the wrong size
Change-Id: I05bc0e68bf4b9f786b9f0cb4466bba002a0fc4d4
2015-12-09 16:24:55 -08:00
Selim Cinek
e812652fba Adapted the appear animation for notification children
Previously the delays where inverted leading to a weird
staggering effect.

Change-Id: I6e212fcf1651cf0e5fa15934a91bc6b648abcfad
2015-12-09 16:24:55 -08:00
Selim Cinek
9c7712d45c Added darkmode for notification groups
Somewhere in the dark a dim shimmer of light appeared

Change-Id: I9de970d4f5b8bb3c3d99f34af7f411f62ff2e094
2015-12-09 16:24:52 -08:00
Chris Craik
c7964751d6 Merge "Add bitmapmesh, rect, and patch rendering" 2015-12-10 00:11:50 +00:00
Greg Hackmann
7aa8aef5f6 Merge "Prefer new zram ABI" 2015-12-10 00:09:51 +00:00
Chris Craik
f09ff5aa57 Add bitmapmesh, rect, and patch rendering
bug:22480459

Change-Id: Id9e9146997dd018b3e4e785c2bc13689e3cf7c3c
2015-12-09 16:06:09 -08:00
Adam Lesinski
535fea1e42 Use Android.mk to specify private symbol package name
Change-Id: I290cb5a16173af9e8d1b16203ed8e8ddaa35045f
2015-12-10 00:03:05 +00:00
Dianne Hackborn
caceb021f1 Merge "Fix issue #26102692: Unable to create secondary user..." 2015-12-10 00:00:10 +00:00
Jorim Jaggi
fefe8ad350 Merge "Enable swipe-from-navbar gesture by default" 2015-12-09 23:36:43 +00:00
Andres Morales
fbf184c472 Merge "make RingBuffer const viable" 2015-12-09 23:25:03 +00:00
Jorim Jaggi
760400c61c Enable swipe-from-navbar gesture by default
Change-Id: Ic38a517c3c53838e3bdd2173a9d245f312136ad4
2015-12-09 15:22:06 -08:00
Bryce Lee
e5d5773f71 Improve logging in BluetoothHeadsetClientCall. am: 3c67873f0a am: 180dd72a9b am: a83d518689
am: 0a8c81a204

* commit '0a8c81a2046753f08c036ec68a15778e0c0dade4':
  Improve logging in BluetoothHeadsetClientCall.
2015-12-09 23:18:52 +00:00
Eino-Ville Talvala
2e8ae98c2f Merge "Replace hard-coded errno values with OsConstants" am: cb299b858f
am: 6fa9cc1bd3

* commit '6fa9cc1bd3cdb0489452396f708d57e22f742bf7':
  Replace hard-coded errno values with OsConstants
2015-12-09 23:17:31 +00:00
Chad Brubaker
1edf850235 Merge "Use a custom TrustedCertificateStore" am: 95f15495a2
am: 5a12cf5cb7

* commit '5a12cf5cb703dd531ca8207e8db87b019eb6d477':
  Use a custom TrustedCertificateStore
2015-12-09 23:15:42 +00:00
Chad Brubaker
8d92314e5f Merge "Expose findByIssuerAndSignature" am: b27d820920
am: f1870eee34

* commit 'f1870eee348179ccfc796956fd366d77f77ab850':
  Expose findByIssuerAndSignature
2015-12-09 23:13:41 +00:00
Bryce Lee
0a8c81a204 Improve logging in BluetoothHeadsetClientCall. am: 3c67873f0a am: 180dd72a9b
am: a83d518689

* commit 'a83d5186898c49888f9b3c1d2ef2333d297d8449':
  Improve logging in BluetoothHeadsetClientCall.
2015-12-09 15:07:23 -08:00
Bryce Lee
a83d518689 Improve logging in BluetoothHeadsetClientCall. am: 3c67873f0a
am: 180dd72a9b

* commit '180dd72a9b36ca6f74e5ad255347d815a0c8729a':
  Improve logging in BluetoothHeadsetClientCall.
2015-12-09 15:01:13 -08:00