Dianne Hackborn
587c0ae641
am 007324bf: am 7f2b9b05: am 4f5e0248: Merge "Hide getPackageProcessState(), it is not ready yet." into mnc-dev
...
* commit '007324bf82ad827d1cb3c571ec96b635fbd9f46c':
Hide getPackageProcessState(), it is not ready yet.
2015-05-14 01:00:45 +00:00
Dianne Hackborn
4f5e024875
Merge "Hide getPackageProcessState(), it is not ready yet." into mnc-dev
2015-05-13 23:29:30 +00:00
Selim Gurun
9d479b7f19
am b5f503c8: am e2b5e7bb: am af9d60af: Merge "Address API feedback for PostMessage" into mnc-dev
...
* commit 'b5f503c8d1f3df2ebe182564fe30a1c17c9ea498':
Address API feedback for PostMessage
2015-05-13 23:06:15 +00:00
Nick Kralevich
f3b7b89c8a
am 50f7e184: am 882b8829: am 9831fad6: Merge "Modify how USB connections are handled." into mnc-dev
...
* commit '50f7e1846249f4fb9226a41a891c31c6cf2549e4':
Modify how USB connections are handled.
2015-05-13 23:06:06 +00:00
Jorim Jaggi
ec33b4ade9
am 53edbb1a: am 1a4df69f: am 645edef4: Merge "Make sure the app can draw a frame before unlocking" into mnc-dev
...
* commit '53edbb1aee03b37b0a039442a6917cd46b3e2a8a':
Make sure the app can draw a frame before unlocking
2015-05-13 22:47:51 +00:00
Yohei Yukawa
1d9d249ba4
am bef7b79b: am d21eeb8f: am 5ad7fe49: Merge "Update IME focus when the active view is losing the focus." into mnc-dev
...
* commit 'bef7b79b0d6e63b1bb709c7fe10326dc7d6c0f12':
Update IME focus when the active view is losing the focus.
2015-05-13 22:47:41 +00:00
Hui Shu
6a5dd5d382
am d484d68d: am 8b5a2421: am 7b1b3613: Merge "Address API council feedback for setOffscreenPreRaster." into mnc-dev
...
* commit 'd484d68d89dddda41acce2426cf5138acdd73be1':
Address API council feedback for setOffscreenPreRaster.
2015-05-13 22:47:32 +00:00
Selim Gurun
af9d60af0d
Merge "Address API feedback for PostMessage" into mnc-dev
2015-05-13 22:37:02 +00:00
Nancy Chen
514cd028ca
am 3b8d8f76: am e8f1f899: am 78250907: Merge "Add phone account field for voicemail to distinguish the source." into mnc-dev
...
* commit '3b8d8f761a5d77b1ee85d777a75c638c38957061':
Add phone account field for voicemail to distinguish the source.
2015-05-13 22:36:25 +00:00
Nick Kralevich
9831fad676
Merge "Modify how USB connections are handled." into mnc-dev
2015-05-13 22:31:57 +00:00
Dianne Hackborn
b725894d05
Hide getPackageProcessState(), it is not ready yet.
...
Change-Id: I188c647573207e89510174e3ad56ca0c19e5ece3
2015-05-13 15:27:23 -07:00
Jorim Jaggi
645edef483
Merge "Make sure the app can draw a frame before unlocking" into mnc-dev
2015-05-13 22:13:27 +00:00
Yohei Yukawa
5ad7fe4930
Merge "Update IME focus when the active view is losing the focus." into mnc-dev
2015-05-13 22:10:37 +00:00
Hui Shu
7b1b3613b9
Merge "Address API council feedback for setOffscreenPreRaster." into mnc-dev
2015-05-13 22:07:55 +00:00
Nancy Chen
782509076b
Merge "Add phone account field for voicemail to distinguish the source." into mnc-dev
2015-05-13 21:54:48 +00:00
Kenny Guy
2de4dd0b8f
am bd5d3a03: am a6e65d2c: am 467eb056: Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev
...
* commit 'bd5d3a03edbded408d3478605f30d6646d98de51':
Allowing profile to set a subset of keyguard restrictions.
2015-05-13 21:45:58 +00:00
Nick Kralevich
fcf10f7c12
Modify how USB connections are handled.
...
* Introduce a new "charger only" mode. In this mode, MTP is disabled,
and no file transfers can occur.
* Make charger only mode the default.
* Modify "persist.sys.usb.config" so it now only holds the adb status.
* Make the USB settings non-persistent. Unplugging the USB connection will
reset the device back to "charger only" mode.
* Fixup wording per UI guidelines.
TODO: Re-implement MDM restrictions for USB / MTP access controls.
Bug: 18905620
Change-Id: I99a50d9132a81e98187f431166fd9fef4d437e4f
2015-05-13 14:28:13 -07:00
Jeff Sharkey
6906e04920
am 06defabf: am cddcdf88: am c968e219: Merge "Determine if we have adoptable disks." into mnc-dev
...
* commit '06defabf3dcbb7168b9eec5e2805d607117401e7':
Determine if we have adoptable disks.
2015-05-13 21:26:36 +00:00
Jorim Jaggi
827e0facfe
Make sure the app can draw a frame before unlocking
...
- The mechanism to stop windows drawing while window animator was
animating was somehow flaky. It relied on the fact that the client
would call relayout() whenever the animating state changed. This is
mostly the case, but not for lockscreen animations. Instead, we now
use a push model, where window manager tells the app that the state
has changed.
- In addition, it only stopped drawing if that window was animating,
but then only resumed drawing after all windows have finished
animating. Now, we do this per window, so we only stop drawing for
windows that are currently animating.
- We resume the top activity now at the very beginning of the
unlocking sequence. This gives the app a chance to draw a frame
before the user sees anything. If it's to slow, then we just use the
outdated framebuffer.
Bug: 19964562
Change-Id: Ifef8abd189a3146d854b81b9b948861e4d38c155
2015-05-13 14:23:05 -07:00
Selim Gurun
0a814b61e3
Address API feedback for PostMessage
...
Bug: 21043955
Add anchor tags, and hide the constructor for WebMessagePort.
Change-Id: Ibd2e15581c06be9015a3cd7c7741edf6657d4552
2015-05-13 14:14:14 -07:00
Kenny Guy
467eb0566f
Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev
2015-05-13 21:07:17 +00:00
Jorim Jaggi
25c861fc42
am 8fd6d671: am 0d56be54: am 131a19ee: Merge "Persist fingerprint names" into mnc-dev
...
* commit '8fd6d6715558a67130f8ff6d84c4c28ef80a874d':
Persist fingerprint names
2015-05-13 21:02:11 +00:00
Todd Kennedy
b9fd81b8d0
am 983f5bb1: am b2a3ad24: am d90bf462: Merge "Don\'t negate saving state" into mnc-dev
...
* commit '983f5bb1dce66c3ce6fa8f187ab715fdc1321ad0':
Don't negate saving state
2015-05-13 21:02:06 +00:00
Jeff Sharkey
c968e21937
Merge "Determine if we have adoptable disks." into mnc-dev
2015-05-13 20:57:03 +00:00
Jeff Sharkey
0d838a0fad
Determine if we have adoptable disks.
...
Bug: 19993667
Change-Id: I9b21b05736c22d34ca22f5ad6e1a6ebec440cfb6
2015-05-13 13:54:35 -07:00
Julia Reynolds
f1bdaa2d26
am b8fb725f: am f7056dbd: am 396d9440: Merge "Remove initiator name param." into mnc-dev
...
* commit 'b8fb725f0ab092ec37a53cc7b0e28cf473d6c841':
Remove initiator name param.
2015-05-13 20:42:21 +00:00
John Spurlock
f98ee06110
am fe4b8433: am 9e957b1b: am fb13d497: Merge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev
...
* commit 'fe4b843390b13429022a5ac0f661dcc573ff7fa6':
Zen: Use shorter version of countdown condition summary in footer.
2015-05-13 20:42:12 +00:00
Jeff Sharkey
9e9c24333e
am 7930df19: am c4febd4c: am 2817f22d: Merge "Hide API not ready for prime time." into mnc-dev
...
* commit '7930df190ae19a665852e1ea5b047145889c878a':
Hide API not ready for prime time.
2015-05-13 20:42:07 +00:00
Jorim Jaggi
131a19ee6f
Merge "Persist fingerprint names" into mnc-dev
2015-05-13 20:32:31 +00:00
Todd Kennedy
d90bf46264
Merge "Don't negate saving state" into mnc-dev
2015-05-13 20:27:17 +00:00
Jorim Jaggi
ee77cebc1a
Persist fingerprint names
...
Bug: 20469328
Change-Id: I8f4a988687bfb78c36cc7cf187103a9d93ed4535
2015-05-13 13:25:26 -07:00
Julia Reynolds
396d944001
Merge "Remove initiator name param." into mnc-dev
2015-05-13 20:14:44 +00:00
Jeff Sharkey
ed8e71e03d
am b26b17a7: am 276671a3: am 4af455be: Merge "Rewriting should fail when any paths are null." into mnc-dev
...
* commit 'b26b17a7c5494be14b885f179e85350efb8daa86':
Rewriting should fail when any paths are null.
2015-05-13 20:13:32 +00:00
John Spurlock
fb13d497ae
Merge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev
2015-05-13 20:10:49 +00:00
Jeff Sharkey
2817f22d15
Merge "Hide API not ready for prime time." into mnc-dev
2015-05-13 20:08:13 +00:00
Jeff Sharkey
f85ac77f0c
Hide API not ready for prime time.
...
Bug: 20642684
Change-Id: I133f023ba7d1d9572175a8f6a3e3c8314c5a897d
2015-05-13 13:07:29 -07:00
John Spurlock
bbde26774f
Zen: Use shorter version of countdown condition summary in footer.
...
To try and keep to two-lines.
Bug: 21119801
Change-Id: I5a6760381a6b673b8481164f92cf6b7b236af349
2015-05-13 15:45:40 -04:00
Jeff Sharkey
4af455beb7
Merge "Rewriting should fail when any paths are null." into mnc-dev
2015-05-13 19:39:26 +00:00
Jeff Sharkey
41be35dd01
Rewriting should fail when any paths are null.
...
Bug: 21017105
Change-Id: I0c5e9c5bdf397d51e2799b06a52bc5bd0bdd09b0
2015-05-13 12:38:16 -07:00
Hui Shu
d377c0f6ca
Address API council feedback for setOffscreenPreRaster.
...
BUG: 21043955
Change-Id: I6481f5f84c9e00c16caeb2d9e175aa869600c715
2015-05-13 12:01:42 -07:00
Jonathan Basseri
b105d967c0
am 4df9a6b7: am 20d14fe3: am c69cd0bf: Merge "Switching to PersistableBundle in carrier config API." into mnc-dev
...
* commit '4df9a6b73d3db5a7969da67e0df82bd24e9da2b3':
Switching to PersistableBundle in carrier config API.
2015-05-13 18:23:13 +00:00
Nicolas Prevot
323fb254ae
am a428fabc: am a09f296c: am 22fec220: Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-dev
...
* commit 'a428fabc09e43a5cd1bb6e8edda546ee917f49dd':
Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED.
2015-05-13 18:23:08 +00:00
Todd Kennedy
46d168fb6b
Don't negate saving state
...
In the original implementation, we would only save the state if the
activity was "!isFinishing()". That was abstracted into a method
that returned whether we should save state. However, the "!" wasn't
removed. D'oh.
Bug: 20860094
Change-Id: I8827cb265f2e7fb911f5d110c56e464aa092bfe7
2015-05-13 11:13:58 -07:00
Jonathan Basseri
4df9a6b73d
am 20d14fe3: am c69cd0bf: Merge "Switching to PersistableBundle in carrier config API." into mnc-dev
...
* commit '20d14fe3a753c7bfbb2b471c853fddfe8740d593':
Switching to PersistableBundle in carrier config API.
2015-05-13 18:11:05 +00:00
Nicolas Prevot
a428fabc09
am a09f296c: am 22fec220: Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-dev
...
* commit 'a09f296c0d6cd6f562391991a51e0a3d5c6356b7':
Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED.
2015-05-13 18:10:59 +00:00
Mady Mellor
56ce4f6a18
am 15398fae: am 4241e307: am 21623faa: Merge "Fix issue where handle is in front of word rather than end of word" into mnc-dev
...
* commit '15398faeb0482c39075718d70f065ff33d01a2ce':
Fix issue where handle is in front of word rather than end of word
2015-05-13 18:05:27 +00:00
Chad Brubaker
83ce095c84
Add keystore onUserAdded/Removed methods
...
(cherry-picked from commit 31c2897105 )
Change-Id: I73fe9344ec5660e58425d5c85d14381820533d57
2015-05-13 10:57:42 -07:00
Mady Mellor
15398faeb0
am 4241e307: am 21623faa: Merge "Fix issue where handle is in front of word rather than end of word" into mnc-dev
...
* commit '4241e3076f5c903a5ed3ebf00999019ab5ef6c70':
Fix issue where handle is in front of word rather than end of word
2015-05-13 17:52:40 +00:00
Jonathan Basseri
c69cd0bf75
Merge "Switching to PersistableBundle in carrier config API." into mnc-dev
2015-05-13 17:46:32 +00:00
Nicolas Prevot
22fec2201f
Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-dev
2015-05-13 17:46:05 +00:00