OSDN Git Service
Keisuke Kuroyanagi [Tue, 29 Sep 2015 20:52:45 +0000 (13:52 -0700)]
Consolidate native methods for text measurement.
Bug:
24505153
Change-Id: I6a00b0516442f7d6108ed0598516365310bd85e8
Jorim Jaggi [Wed, 9 Sep 2015 21:59:23 +0000 (21:59 +0000)]
am
463bf7cc: am
46154b8f: am
b5304547: am
5e354223: Use AlarmManager for lockout reset
* commit '
463bf7cc36660174166ad2aab7d1814bf35c8066':
Use AlarmManager for lockout reset
Jorim Jaggi [Wed, 9 Sep 2015 21:48:23 +0000 (21:48 +0000)]
am
46154b8f: am
b5304547: am
5e354223: Use AlarmManager for lockout reset
* commit '
46154b8fa50c4e8176225981500ad95a5b667cea':
Use AlarmManager for lockout reset
Ben Kwa [Wed, 9 Sep 2015 21:10:29 +0000 (21:10 +0000)]
Merge "Fix a crash during file deletion."
Jorim Jaggi [Wed, 9 Sep 2015 21:00:49 +0000 (21:00 +0000)]
am
b5304547: am
5e354223: Use AlarmManager for lockout reset
* commit '
b53045476ce228d510b045276f84f004d3b9eeb8':
Use AlarmManager for lockout reset
Jorim Jaggi [Wed, 9 Sep 2015 20:54:42 +0000 (20:54 +0000)]
am
5e354223: Use AlarmManager for lockout reset
* commit '
5e354223d817477efac9a6a2e3ce3d9161e046a4':
Use AlarmManager for lockout reset
Chris Craik [Wed, 9 Sep 2015 20:51:41 +0000 (20:51 +0000)]
Merge "CanvasState frame init refactor"
Ben Kwa [Wed, 9 Sep 2015 20:49:07 +0000 (13:49 -0700)]
Fix a crash during file deletion.
Fix an off-by-one error when checking deletion candidates, that was
causing item positions to be incorrectly bumped following a successful
deletion.
BUG=
23823860
Change-Id: Id261ad49271fb0c1a5ff1cba88fea1451412d7f3
Jorim Jaggi [Fri, 4 Sep 2015 21:17:58 +0000 (14:17 -0700)]
Use AlarmManager for lockout reset
So the lockout reset exactly fires after 30 seconds, independent
of whether the device was in deep sleep.
Bug:
23668918
Change-Id: Idea1a877c395897c1fd075cf98edf41c8b1f4082
Nick Armstrong-Crews [Wed, 9 Sep 2015 19:59:50 +0000 (19:59 +0000)]
Merge "Remove @hide for KEYCODE_SOFT_SLEEP."
Filip Gruszczynski [Wed, 9 Sep 2015 19:49:15 +0000 (19:49 +0000)]
Merge "Refactorings for Window Manager module."
Filip Gruszczynski [Wed, 9 Sep 2015 19:47:27 +0000 (19:47 +0000)]
Merge "Better logging when starting window request is rejected."
Steve McKay [Wed, 9 Sep 2015 19:12:20 +0000 (19:12 +0000)]
Merge "Don't start band select on empty grid."
Steve McKay [Wed, 9 Sep 2015 00:15:25 +0000 (17:15 -0700)]
Don't start band select on empty grid.
Masks an issue in band controller resulting in index out of bounds exceptions.
Eliminate the need to cast helper when constructing BandController.
Improve naming of Band related classes for clarity of purpose.
Normalize some "helper" class method names.
Rename BandSelectModelTest to match existing convention for tests on inner classes.
Bug:
23905473
Change-Id: Iaf7604fb729cf563a04dc92d78b24e2fe4812abe
Filip Gruszczynski [Sat, 5 Sep 2015 22:00:00 +0000 (15:00 -0700)]
Refactorings for Window Manager module.
Following improvements were applied:
* extract code from a very large method
WindowSurfacePlacer.performSurfacePlacementInner into
WindowsurfacePlacer.applySurfaceChangesTransaction; smaller methods
are easier to understand;
* WindowStateAnimator.showSurfaceRobustlyLocked can be privatized, it
is only called from one place; also there is unnecessary check for
whether mSurfaceControl is not null;
* prepareAppTransition code can be mostly moved into AppTransition;
it calls mostly methods from this class; as a result some methods
from AppTransition can be privatized;
* requestTraversalLocked can be moved into WindowSurfacePlacer, which
allows mTraversalScheduled to be a private field inside the placer;
this way WindowSurfacePlacer can nicely control and hide the need for
layouts.
Change-Id: I99006c859ef224f5dad933f5c15d2cb2b9738a9e
Jason Monk [Wed, 9 Sep 2015 18:49:58 +0000 (18:49 +0000)]
Merge "QS: Add long-press to customize prototype - part 3"
Filip Gruszczynski [Wed, 9 Sep 2015 18:30:12 +0000 (11:30 -0700)]
Better logging when starting window request is rejected.
Change-Id: Iba0469c7f00ab0cfe1901ef7e16a6e81cd045392
Jason Monk [Wed, 9 Sep 2015 18:00:31 +0000 (18:00 +0000)]
Merge "QS: Add long-press to customize prototype - part 2"
Jason Monk [Wed, 9 Sep 2015 17:50:34 +0000 (13:50 -0400)]
QS: Add long-press to customize prototype - part 3
Adding FAB button to QS customization screen, currently it does
nothing.
Change-Id: I4d4d4cd0a6dd5d2104cf21011855fcfce13c70d7
Jason Monk [Wed, 9 Sep 2015 17:03:20 +0000 (13:03 -0400)]
QS: Add long-press to customize prototype - part 2
- Add info/remove drop targets that appear during dragging
- Move drag start into NonPagedTileLayout so that both start
and end of tile move drags are in the same place.
- Still needs way to add tiles
Change-Id: If843ebbb86f393b461289c1407c6a82b6a5aed9d
Vineeta Srivastava [Wed, 9 Sep 2015 17:46:58 +0000 (17:46 +0000)]
am
71474c66: am
63d94e4c: am
95198ee9: am
ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev
* commit '
71474c66bf2b14c1421699937011ef38501dad76':
Add carrier config variable to hide ims apn
Vineeta Srivastava [Wed, 9 Sep 2015 17:40:34 +0000 (17:40 +0000)]
am
63d94e4c: am
95198ee9: am
ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev
* commit '
63d94e4c3be9190554ed51f2b00eb764707fd848':
Add carrier config variable to hide ims apn
Vineeta Srivastava [Wed, 9 Sep 2015 17:31:06 +0000 (17:31 +0000)]
am
95198ee9: am
ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev
* commit '
95198ee9ce374582e71b5a29e740e97b7b7b198b':
Add carrier config variable to hide ims apn
Vineeta Srivastava [Wed, 9 Sep 2015 17:22:28 +0000 (17:22 +0000)]
am
ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev
* commit '
ebd1465885af2a1de5a885dac791ee6184f85d7f':
Add carrier config variable to hide ims apn
Vineeta Srivastava [Wed, 9 Sep 2015 17:12:39 +0000 (17:12 +0000)]
Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev
Nick Armstrong-Crews [Wed, 9 Sep 2015 16:25:03 +0000 (09:25 -0700)]
Remove @hide for KEYCODE_SOFT_SLEEP.
Change-Id: I56a6da9faeafb26145e1d9ad82a16df46320c24e
Tyler Gunn [Wed, 9 Sep 2015 17:01:45 +0000 (10:01 -0700)]
resolved conflicts for
ce88b828 to master
Change-Id: Ibf9f4bc876f32c8f5de86ee8338dcff3a5276cfb
Tyler Gunn [Wed, 9 Sep 2015 16:34:04 +0000 (16:34 +0000)]
am
67e4317a: am
6544d5a2: am
dee1c5c9: Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev
* commit '
67e4317aa3671f6bff1855922e794ae1c6588bd2':
Add carrier config for specifying invalid characters.
Tyler Gunn [Wed, 9 Sep 2015 16:26:30 +0000 (16:26 +0000)]
am
6544d5a2: am
dee1c5c9: Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev
* commit '
6544d5a2a7089b6e76c0548cd9f63f9400ce1082':
Add carrier config for specifying invalid characters.
Tyler Gunn [Wed, 9 Sep 2015 16:15:52 +0000 (16:15 +0000)]
am
dee1c5c9: Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev
* commit '
dee1c5c948a5e1b98577a3301882aac04154b5be':
Add carrier config for specifying invalid characters.
Tyler Gunn [Wed, 9 Sep 2015 16:09:33 +0000 (16:09 +0000)]
Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev
Tao Bai [Wed, 9 Sep 2015 16:08:12 +0000 (16:08 +0000)]
Merge "Load app resource as shared library."
Svetoslav Ganov [Wed, 9 Sep 2015 05:06:16 +0000 (05:06 +0000)]
am
5f677b11: (-s ours) am
4f1bd159: am
db4efcfa: am
f57d9856: am
4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '
5f677b114c52db916207e95694027a50c2a30d51':
Add get_accounts app op
Svetoslav Ganov [Wed, 9 Sep 2015 02:08:18 +0000 (02:08 +0000)]
am
4f1bd159: am
db4efcfa: am
f57d9856: am
4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '
4f1bd159d9042106d112cbf579c2daf82842f375':
Add get_accounts app op
Svetoslav Ganov [Wed, 9 Sep 2015 02:01:24 +0000 (02:01 +0000)]
am
db4efcfa: am
f57d9856: am
4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '
db4efcfa8dd996841eb50cf2594bea641b4f217a':
Add get_accounts app op
Svetoslav Ganov [Wed, 9 Sep 2015 01:51:37 +0000 (01:51 +0000)]
am
f57d9856: am
4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '
f57d98564b26953b722ab0e14222f50e6515f36d':
Add get_accounts app op
Tao Bai [Wed, 2 Sep 2015 01:49:54 +0000 (18:49 -0700)]
Load app resource as shared library.
- Added aapt command line flag --app-as-shared-lib to build app resources
that could be loaded as shared lib at runtime.
- Added new method AssetManager.addAssetPathAsSharedLibrary() to load an
app resource as shared library.
Bug
22487604
Change-Id: Ib9b33c35f9c2b7129f3ba205de03d4564623ea39
Svetoslav Ganov [Wed, 9 Sep 2015 01:42:56 +0000 (01:42 +0000)]
am
4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '
4f7d0bc7af5fbb65796d24b130b7e9e63107bc5d':
Add get_accounts app op
Svetoslav Ganov [Wed, 9 Sep 2015 01:36:58 +0000 (01:36 +0000)]
Merge "Add get_accounts app op" into mnc-dev
Zhentao Sun [Wed, 9 Sep 2015 01:10:18 +0000 (01:10 +0000)]
am
d6a94f49: am
aded82ce: am
6d8bdb50: am
5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev
* commit '
d6a94f495a86561a8e5a7f032e8179eae44abcaf':
Changed the vibration duration from 1s to 750ms.
Lorenzo Colitti [Wed, 9 Sep 2015 01:04:38 +0000 (01:04 +0000)]
am
fd183706: am
22262f31: am
0bc35668: am
017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit '
fd18370675f8794807747a18276dd7385e25f06e':
Require the new PACKET_KEEPALIVE_OFFLOAD permission.
Add an error code for generic hardware error.
Fix bugs and crashes in PacketKeepalive API.
Add tests for the PacketKeepalive API.
Add a PACKET_KEEPALIVE_OFFLOAD permission.
Use a CountDownLatch instead of sleep() in NetworkFactory tests.
Get rid of shortSleep() in ConnectivityServiceTest.
Make ConnectivityServiceTest a bit more readable.
Jorim Jaggi [Wed, 9 Sep 2015 01:04:25 +0000 (01:04 +0000)]
am
6198a703: am
2a198de7: am
975ceef6: am
52429b4a: Cancel animation when hiding Keyguard
* commit '
6198a70371ca799b705d7767ac8c710187ab68f8':
Cancel animation when hiding Keyguard
Zhentao Sun [Wed, 9 Sep 2015 00:59:39 +0000 (00:59 +0000)]
am
aded82ce: am
6d8bdb50: am
5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev
* commit '
aded82ce3134b7f8a2db7e4e7462e16e0428ef96':
Changed the vibration duration from 1s to 750ms.
Selim Cinek [Wed, 9 Sep 2015 00:56:55 +0000 (17:56 -0700)]
resolved conflicts for
09fd58fd to master
Change-Id: Icac7e81259d5269afe72eeadd7d761fc8d3af93e
Svetoslav [Tue, 8 Sep 2015 21:36:35 +0000 (14:36 -0700)]
Add get_accounts app op
For each runtime permission we have an app op to toggle the
permission for legacy apps as they cannot handle permission
revocations. We were lacking an app op for get_accounts
which prevented the user from controlling access to accounts
regardelss that they change the state of the permission
toggle in the UI. Even worse the permission UI is written
with the assumption that every runtime permission has an
app op and as a result revoking the contacts group (if the
app requests the get_accounts permission) is reset back to
allowed in the UI.
bug:
23854618
Change-Id: I9e3f9bfeb320bed561d718db99ee285915d5701b
Zhentao Sun [Wed, 9 Sep 2015 00:48:18 +0000 (00:48 +0000)]
am
6d8bdb50: am
5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev
* commit '
6d8bdb50b0cd26629a18ae3124fb29673069493b':
Changed the vibration duration from 1s to 750ms.
Lorenzo Colitti [Wed, 9 Sep 2015 00:45:42 +0000 (00:45 +0000)]
am
22262f31: am
0bc35668: am
017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit '
22262f31b964d595b56eb1277e4d88550a03e54c':
Require the new PACKET_KEEPALIVE_OFFLOAD permission.
Add an error code for generic hardware error.
Fix bugs and crashes in PacketKeepalive API.
Add tests for the PacketKeepalive API.
Add a PACKET_KEEPALIVE_OFFLOAD permission.
Use a CountDownLatch instead of sleep() in NetworkFactory tests.
Get rid of shortSleep() in ConnectivityServiceTest.
Make ConnectivityServiceTest a bit more readable.
Zhentao Sun [Wed, 9 Sep 2015 00:38:48 +0000 (00:38 +0000)]
am
5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev
* commit '
5536d4477572e437c95111630d5c2723350d99a5':
Changed the vibration duration from 1s to 750ms.
Lorenzo Colitti [Wed, 9 Sep 2015 00:38:42 +0000 (00:38 +0000)]
am
0bc35668: am
017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit '
0bc356687e022fa1ae611c4ebeb0e0622810d7e4':
Require the new PACKET_KEEPALIVE_OFFLOAD permission.
Add an error code for generic hardware error.
Fix bugs and crashes in PacketKeepalive API.
Add tests for the PacketKeepalive API.
Add a PACKET_KEEPALIVE_OFFLOAD permission.
Use a CountDownLatch instead of sleep() in NetworkFactory tests.
Get rid of shortSleep() in ConnectivityServiceTest.
Make ConnectivityServiceTest a bit more readable.
Zhentao Sun [Wed, 9 Sep 2015 00:29:03 +0000 (00:29 +0000)]
Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev
Jorim Jaggi [Wed, 9 Sep 2015 00:28:48 +0000 (00:28 +0000)]
am
2a198de7: am
975ceef6: am
52429b4a: Cancel animation when hiding Keyguard
* commit '
2a198de79d0d5b93168a3fccd45977f5731b3451':
Cancel animation when hiding Keyguard
Lorenzo Colitti [Wed, 9 Sep 2015 00:26:53 +0000 (00:26 +0000)]
am
017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit '
017223acda5bfe16cb87d0a33d72dd28d2fccd3b':
Require the new PACKET_KEEPALIVE_OFFLOAD permission.
Add an error code for generic hardware error.
Fix bugs and crashes in PacketKeepalive API.
Add tests for the PacketKeepalive API.
Add a PACKET_KEEPALIVE_OFFLOAD permission.
Use a CountDownLatch instead of sleep() in NetworkFactory tests.
Get rid of shortSleep() in ConnectivityServiceTest.
Make ConnectivityServiceTest a bit more readable.
Sungmin Choi [Mon, 31 Aug 2015 22:32:20 +0000 (15:32 -0700)]
Add carrier config variable to hide ims apn
Bug:
23770219
Change-Id: I691d2594384196852d7128a9b4969ba9a861205c
Jorim Jaggi [Wed, 9 Sep 2015 00:19:24 +0000 (00:19 +0000)]
am
975ceef6: am
52429b4a: Cancel animation when hiding Keyguard
* commit '
975ceef616aac6de561c4a4e1d82a636f5cf37e3':
Cancel animation when hiding Keyguard
Lorenzo Colitti [Wed, 9 Sep 2015 00:18:39 +0000 (00:18 +0000)]
Merge changes from topic 'packet-keepalive-fixes' into mnc-dr-dev
* changes:
Require the new PACKET_KEEPALIVE_OFFLOAD permission.
Add an error code for generic hardware error.
Fix bugs and crashes in PacketKeepalive API.
Add tests for the PacketKeepalive API.
Add a PACKET_KEEPALIVE_OFFLOAD permission.
Use a CountDownLatch instead of sleep() in NetworkFactory tests.
Get rid of shortSleep() in ConnectivityServiceTest.
Make ConnectivityServiceTest a bit more readable.
Selim Cinek [Wed, 9 Sep 2015 00:16:04 +0000 (00:16 +0000)]
am
89d80472: am
ad69e53e: am
edf47486: Removed the secure camera launcher
* commit '
89d804727473009fe8e53a0040f0ac70b3bd221a':
Removed the secure camera launcher
Filip Gruszczynski [Wed, 9 Sep 2015 00:12:49 +0000 (00:12 +0000)]
Merge "Refactoring of setting app starting window code."
Jorim Jaggi [Wed, 9 Sep 2015 00:12:31 +0000 (00:12 +0000)]
am
52429b4a: Cancel animation when hiding Keyguard
* commit '
52429b4a8b9be501f52df62e77c3e4bbb5bf0c3f':
Cancel animation when hiding Keyguard
Selim Cinek [Wed, 9 Sep 2015 00:08:11 +0000 (00:08 +0000)]
am
ad69e53e: am
edf47486: Removed the secure camera launcher
* commit '
ad69e53e7ee3fdaaff676ae5d0e99f6b267675f9':
Removed the secure camera launcher
Jorim Jaggi [Fri, 4 Sep 2015 02:58:19 +0000 (19:58 -0700)]
Cancel animation when hiding Keyguard
So we don't end up in a wrong state.
Bug:
23692022
Change-Id: If40eb66499c95b82d86873dbbd6ccc64468373b2
Selim Cinek [Tue, 8 Sep 2015 23:58:58 +0000 (23:58 +0000)]
am
edf47486: Removed the secure camera launcher
* commit '
edf47486507f5edad1d1d8e6091b9a82f9e56930':
Removed the secure camera launcher
Selim Cinek [Wed, 2 Sep 2015 01:05:08 +0000 (18:05 -0700)]
Removed the secure camera launcher
With Android M, the system correctly handles camera arbitration
and therefore the secure camera launcher was only adding delay.
Bug:
23713450
Change-Id: Icd5e7883f3560bfd0c9b5f7bd93675847949469b
Zhentao Sun [Tue, 8 Sep 2015 22:41:25 +0000 (15:41 -0700)]
Changed the vibration duration from 1s to 750ms.
Fixed b/
23727634.
Change-Id: Ie03b26f7b8faee8d61d772041351729995f7088c
Android Git Automerger [Tue, 8 Sep 2015 22:31:22 +0000 (22:31 +0000)]
am
c8abdab5: am
07b3195f: am
c698ece7: am
3bed3bf4: am
92aeac34: am
1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
* commit '
c8abdab5be344a21e4426827bae5b6562bf180bf':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 22:31:14 +0000 (22:31 +0000)]
am
698e90b1: am
27a85cca: am
fb53f115: am
d35c7940: am
2c31a0d7: am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
698e90b1f0fe4b105127d029c0db1aa42fd09ea9':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Android Git Automerger [Tue, 8 Sep 2015 22:19:50 +0000 (22:19 +0000)]
am
07b3195f: am
c698ece7: am
3bed3bf4: am
92aeac34: am
1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
* commit '
07b3195f7b156d9123797fac9160bc27cb17263c':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 22:19:44 +0000 (22:19 +0000)]
am
27a85cca: am
fb53f115: am
d35c7940: am
2c31a0d7: am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
27a85cca7c001ec47749feb60461081f14b2dfe3':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Android Git Automerger [Tue, 8 Sep 2015 22:13:28 +0000 (22:13 +0000)]
am
c698ece7: am
3bed3bf4: am
92aeac34: am
1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
* commit '
c698ece7cf5d2651741439921f7a241a4f51354b':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 22:13:22 +0000 (22:13 +0000)]
am
fb53f115: am
d35c7940: am
2c31a0d7: am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
fb53f11515554f618d5888c8137119bcc4f316cb':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Android Git Automerger [Tue, 8 Sep 2015 22:04:36 +0000 (22:04 +0000)]
am
3bed3bf4: am
92aeac34: am
1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
* commit '
3bed3bf498eadcaa760608a415c66e017d2eb690':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 22:04:32 +0000 (22:04 +0000)]
am
d35c7940: am
2c31a0d7: am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
d35c7940112fa7edae03a1b43670157787a69d3d':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Android Git Automerger [Tue, 8 Sep 2015 21:55:50 +0000 (21:55 +0000)]
am
92aeac34: am
1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
* commit '
92aeac3499e91985a266590aff88b06a9633b667':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 21:55:46 +0000 (21:55 +0000)]
am
2c31a0d7: am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
2c31a0d774cebb9603d3dd7f904af20dce4f3bd4':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Android Git Automerger [Tue, 8 Sep 2015 21:46:08 +0000 (21:46 +0000)]
am
1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
* commit '
1c88f605629a5f1647a8af1fdcfe0fb6e3eea847':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 8 Sep 2015 21:46:02 +0000 (21:46 +0000)]
am
9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit '
9e28efe4e79402e1ae9c92579d4ea2bc5b4bb664':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
xin He [Tue, 8 Sep 2015 21:39:51 +0000 (21:39 +0000)]
am
10c5dad9: am
fb4e0323: am
2248874b: am
ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev
* commit '
10c5dad9bbef474e4d945bfcc70db2c82a1f6921':
Introduce config_wifi_revert_country_code_on_cellular_loss
Android Git Automerger [Tue, 8 Sep 2015 21:37:33 +0000 (21:37 +0000)]
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
Cheryl Potter [Tue, 11 Aug 2015 18:43:59 +0000 (11:43 -0700)]
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
b/
22822607
Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20
Cheryl Potter [Tue, 8 Sep 2015 21:36:35 +0000 (21:36 +0000)]
am
4b32b3f4: Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs
* commit '
4b32b3f43fe8e27ffdb19d51364ebd99a3503e79':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Aaron Vaage [Tue, 8 Sep 2015 21:33:29 +0000 (21:33 +0000)]
Merge "Resolving createByteBufferFromABuffer null input"
xin He [Tue, 8 Sep 2015 21:31:35 +0000 (21:31 +0000)]
am
fb4e0323: am
2248874b: am
ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev
* commit '
fb4e0323a248c720170e010ea97299bf3f7415d1':
Introduce config_wifi_revert_country_code_on_cellular_loss
Cheryl Potter [Tue, 8 Sep 2015 21:28:06 +0000 (21:28 +0000)]
Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs
Phil Burk [Tue, 8 Sep 2015 21:27:37 +0000 (21:27 +0000)]
Merge "BLE-MIDI: change binding for BluetoothMidiService"
xin He [Tue, 8 Sep 2015 21:20:02 +0000 (21:20 +0000)]
am
2248874b: am
ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev
* commit '
2248874b8b7503b484556a1b46fdb23379fbc107':
Introduce config_wifi_revert_country_code_on_cellular_loss
Jorim Jaggi [Tue, 8 Sep 2015 21:15:35 +0000 (21:15 +0000)]
am
ae44c285: am
dee90112: am
10352f7a: am
5e8e1c63: Do not expand notifications with expand gesture when disallowed
* commit '
ae44c2857d3887c7830512b294f59195177ea035':
Do not expand notifications with expand gesture when disallowed
xin He [Tue, 8 Sep 2015 21:09:13 +0000 (21:09 +0000)]
am
ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev
* commit '
ee1babecd204def48feb1fcf648dbed5cd760697':
Introduce config_wifi_revert_country_code_on_cellular_loss
Jorim Jaggi [Tue, 8 Sep 2015 21:08:40 +0000 (21:08 +0000)]
am
dee90112: am
10352f7a: am
5e8e1c63: Do not expand notifications with expand gesture when disallowed
* commit '
dee90112ce6d47a5740fd60449f948c37a8956e4':
Do not expand notifications with expand gesture when disallowed
xin He [Tue, 8 Sep 2015 21:01:49 +0000 (21:01 +0000)]
Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev
Jorim Jaggi [Tue, 8 Sep 2015 20:58:56 +0000 (20:58 +0000)]
am
10352f7a: am
5e8e1c63: Do not expand notifications with expand gesture when disallowed
* commit '
10352f7a48433b5b76cd5d35a5eec6c3df203a1f':
Do not expand notifications with expand gesture when disallowed
Jorim Jaggi [Tue, 8 Sep 2015 20:50:53 +0000 (20:50 +0000)]
am
5e8e1c63: Do not expand notifications with expand gesture when disallowed
* commit '
5e8e1c63774da8c013fad18a63eac691cdc9646f':
Do not expand notifications with expand gesture when disallowed
Phil Burk [Thu, 3 Sep 2015 21:37:03 +0000 (14:37 -0700)]
BLE-MIDI: change binding for BluetoothMidiService
Add a remote call addBluetoothDevice() using AIDL.
This was needed because onBind() is only called once.
Bug:
23219556
Bug:
23760886
Change-Id: Id7554ca55d596352d11dbd6ae3e403138a29c864
Signed-off-by: Phil Burk <philburk@google.com>
Filip Gruszczynski [Tue, 8 Sep 2015 20:00:49 +0000 (13:00 -0700)]
Refactoring of setting app starting window code.
This improves the code in following ways:
* move transferring of starting window into a separate method, so it can
be easier to understand;
* move checking of whether to display starting window from phone window
manager to window manager service; this has three benefits:
1) whole logic is in one place;
2) we don't need to schedule addition of a starting window, if we
would stop it later anyway;
3) we don't need to wait for creation of window style to decide, if a
window is floating.
Change-Id: Ibfbd87b84a7080e372211f162fa1865f8c5ab973
Jason Monk [Tue, 8 Sep 2015 19:39:35 +0000 (19:39 +0000)]
Merge "QS: Add long-press to customize prototype - part 1"
Jason Monk [Thu, 3 Sep 2015 19:46:25 +0000 (15:46 -0400)]
QS: Add long-press to customize prototype - part 1
Start adding prototype to long-press to go to customization view
for QS. Currently it allows re-arranging and resetting. Later
it will have more.
Change-Id: Ib2ba0f93ac2f4cced4f146d39771a8a17ac05bc2
Filip Gruszczynski [Tue, 8 Sep 2015 19:22:40 +0000 (19:22 +0000)]
Merge "Fix thumbnail animation when going into fullscreen."
Jorim Jaggi [Fri, 4 Sep 2015 18:51:26 +0000 (11:51 -0700)]
Do not expand notifications with expand gesture when disallowed
Bug:
23596083
Change-Id: Iba88abce317e9d3a9c675a846261f35b1daee22a
Makoto Onuki [Tue, 8 Sep 2015 18:28:53 +0000 (18:28 +0000)]
Merge "[split system] Tentatively support running DO on meat user"
Makoto Onuki [Fri, 4 Sep 2015 17:48:16 +0000 (10:48 -0700)]
[split system] Tentatively support running DO on meat user
- setDeviceOwner() now takes a user ID. (We can infer it from Binder, but
we still need it for the dpm command.)
- Change broadcast target UID for DO to the DO user
- Start the DO user on boot complete.
TODO Investigate whether this is actually the good timing.
TODO Prevent the DO user from being killed
Bug
23827706
Change-Id: I227dbd444f1f4e94d98c317489d151554fe79d91
Filip Gruszczynski [Tue, 8 Sep 2015 18:18:54 +0000 (11:18 -0700)]
Fix thumbnail animation when going into fullscreen.
The fullscreen case depends on the default animation to be set, but only
multi window specs array was used.
Change-Id: I873bcf4168be76f8af66b2a1f50ba3e7e0969f6c
Cheryl Potter [Tue, 11 Aug 2015 18:43:59 +0000 (11:43 -0700)]
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
b/
22822607
Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20