Selim Cinek
9b1d30ee90
Merge changes I0ca13626,I3677ce54 into nyc-dev am: bbcb733d80 am: 20367dbd3b
...
am: 3ada4842b2
Change-Id: I8fd4ce070667157371e18e15c2e145f1938aa0ab
2016-06-08 19:57:32 +00:00
Jason Monk
c7ab3048fe
Merge \\\"QS Edit: Extra extra make sure hidden when locked\\\" into nyc-dev am: fd6e7e6790 am: 7399cf0ca6
...
am: b995b74377
Change-Id: I4a68e6325f48706be28ca352fb74794470a32d2a
2016-06-08 19:50:45 +00:00
Jason Monk
3530ff2df2
Merge \\\"QS: Fix leak in QSAnimator\\\" into nyc-dev am: 883da638e2 am: d97d435c09
...
am: e6d0ef984a
Change-Id: I03c8d79179c08e77984ee78bfc36c8c0ebb02c8e
2016-06-08 19:50:38 +00:00
Selim Cinek
3ada4842b2
Merge changes I0ca13626,I3677ce54 into nyc-dev am: bbcb733d80
...
am: 20367dbd3b
Change-Id: Id8cafbb4ee743d604626af882fe25f5a09296a2b
2016-06-08 19:49:57 +00:00
Jason Monk
1e86c376ea
resolve merge conflicts of 781e8c2 to nyc-mr1-dev-plus-aosp
...
am: ea92d5d1c0
Change-Id: I1aabe531b0a2a26828f0ec68de70158b8c11e3fb
2016-06-08 19:45:38 +00:00
Selim Cinek
20367dbd3b
Merge changes I0ca13626,I3677ce54 into nyc-dev
...
am: bbcb733d80
Change-Id: I1ab5db3410322ea9880ad4bce9b78b8355c0f2ce
2016-06-08 19:45:13 +00:00
Jason Monk
b995b74377
Merge \\"QS Edit: Extra extra make sure hidden when locked\\" into nyc-dev am: fd6e7e6790
...
am: 7399cf0ca6
Change-Id: I70215682074195d217e170daf94763ee5f5a6444
2016-06-08 19:44:50 +00:00
Jason Monk
e6d0ef984a
Merge \\"QS: Fix leak in QSAnimator\\" into nyc-dev am: 883da638e2
...
am: d97d435c09
Change-Id: I62c2c08e956a59e9c6cee2397a003cff960eb5d1
2016-06-08 19:44:48 +00:00
Will Harmon
2ba211b5ca
Merge \\\"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\\\" into nyc-dev am: 4455fc734c am: 81f69753ed
...
am: 202d7a4f48
Change-Id: Id1cb31d3ad2d8fe1f1e8c0c89ae27275c799e550
2016-06-08 19:41:13 +00:00
Jason Monk
ea92d5d1c0
resolve merge conflicts of 781e8c2 to nyc-mr1-dev-plus-aosp
...
Change-Id: I737217ecc25a6c480132c6f1a932c4579fa96e05
2016-06-08 15:39:30 -04:00
Selim Cinek
bbcb733d80
Merge changes I0ca13626,I3677ce54 into nyc-dev
...
* changes:
Fixed a flicker when closing QS without notifications
Handled expandability and swiping while guts are exposed
2016-06-08 19:37:40 +00:00
Jason Monk
202d7a4f48
Merge \\"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\\" into nyc-dev am: 4455fc734c
...
am: 81f69753ed
Change-Id: I2b61ce54d42be0648f7d53e2a7e659da2c9c00d7
2016-06-08 19:34:38 +00:00
Jason Monk
7399cf0ca6
Merge \"QS Edit: Extra extra make sure hidden when locked\" into nyc-dev
...
am: fd6e7e6790
Change-Id: I0fbfd17114fbcf6c4552d5f192ce17722272a6c6
2016-06-08 19:21:33 +00:00
Jason Monk
d97d435c09
Merge \"QS: Fix leak in QSAnimator\" into nyc-dev
...
am: 883da638e2
Change-Id: I7e8f106c741a8fc1b920bad2ffd65331463e148b
2016-06-08 19:21:29 +00:00
Jason Monk
781e8c2bfb
Merge \"QS: Show date even on small screens\" into nyc-dev
...
am: fbf366d7ee
Change-Id: I7650ec130e8bcf31b2924af96e8bb2c412111c17
2016-06-08 19:21:26 +00:00
Will Harmon
81f69753ed
Merge \"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\" into nyc-dev
...
am: 4455fc734c
Change-Id: I391ada63a040537925d8b8a8151d0e6d49a6e69b
2016-06-08 19:21:22 +00:00
Jason Monk
fd6e7e6790
Merge "QS Edit: Extra extra make sure hidden when locked" into nyc-dev
2016-06-08 19:12:20 +00:00
Jason Monk
883da638e2
Merge "QS: Fix leak in QSAnimator" into nyc-dev
2016-06-08 19:12:07 +00:00
Jason Monk
fbf366d7ee
Merge "QS: Show date even on small screens" into nyc-dev
2016-06-08 19:11:41 +00:00
Will Harmon
604c2f9440
Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.
...
Fixes: 28721139
Change-Id: Ib53c7cc08e9378420a5fed3459c1e17864b28802
2016-06-08 19:10:57 +00:00
Sudheer Shanka
939efb2f86
Merge \\"Disable some QS functionality in retail demo mode.\\" into nyc-mr1-dev am: 31a37ed77f
...
am: 21d55c332a
Change-Id: Ib051f529a80dbfdbec6067989fc4dae2fb5e22f2
2016-06-08 18:09:49 +00:00
Sudheer Shanka
21d55c332a
Merge \"Disable some QS functionality in retail demo mode.\" into nyc-mr1-dev
...
am: 31a37ed77f
Change-Id: I2ef9a862017dbff63aaeb130a6817066ca608d68
2016-06-08 17:26:47 +00:00
Sudheer Shanka
31a37ed77f
Merge "Disable some QS functionality in retail demo mode." into nyc-mr1-dev
2016-06-08 17:15:04 +00:00
Jason Monk
9ffd9f61d3
QS: Fix leak in QSAnimator
...
Change-Id: I54f1e083cf6ba6bfb5abc0f416680cbda1401980
Fixes: 29113833
2016-06-08 09:05:08 -04:00
Ian Rogers
2ad3859140
Merge "Fix broken sort order."
2016-06-07 23:43:53 +00:00
Jason Monk
487e1f8500
QS: Show date even on small screens
...
People don't like to lose their date, so instead take away their
detailed alarm information.
Change-Id: Ia6a1c7b1ecdb73eeeadd45fc3708531eac588eee
Fixes: 28773347
2016-06-07 15:59:51 -04:00
William Harmon
dc8441d804
Redirect for AS error message regarding SDK license agreements am: 5fb0843a7f am: fc329098d2 am: 79cb94b8d6 am: 779adf8879
...
am: a063331e29
* commit 'a063331e29c14abf451eff389bee53ca5a447f03':
Bug: 28875393 Bug: 28879732
Change-Id: If7c556163f697c2504c7a7229733dfcc7e0d5894
2016-06-07 16:32:02 +00:00
Adarsh Fernando
a063331e29
Redirect for AS error message regarding SDK license agreements am: 5fb0843a7f am: fc329098d2 am: 79cb94b8d6
...
am: 779adf8879
* commit '779adf8879f94ffa97d0f889f1376c5bb3929ef4':
Bug: 28875393 Bug: 28879732
Change-Id: I0e09b58fe2627f0858d44eb52807726c03f32760
2016-06-07 16:21:38 +00:00
Ian Rogers
31756df8ca
Fix broken sort order.
...
Int conversion may invert the sign of a long making it unsuitable for use in
comparators.
Caught by Error Prone.
Bug: 27723540
Change-Id: I418abd102004f524080190eb5f1a53ec1388b58a
2016-06-07 08:48:07 -07:00
Will Harmon
beb1f177ef
Bug: 28875393
...
Bug: 28879732
Fixes a bug where setting an app as a default quicksettings tile will
show it twice.
Change-Id: Ie71746d85c6782810966c62be416a62545329859
2016-06-06 14:52:40 -07:00
Jason Monk
181d3fec0a
QS Edit: Extra extra make sure hidden when locked
...
Change-Id: I11a150dae5dbde97a61a4b00b857a856f8a409c2
Fixes: 28997488
2016-06-06 16:18:50 -04:00
Selim Cinek
90b6a276bf
Fixed a flicker when closing QS without notifications
...
Change-Id: I0ca13626a676d0adf427d95edd76dd1bd2228fdc
Fixes: 28008271
2016-06-06 17:20:33 +00:00
Chen Xu
ac5392467a
Merge "cold sim clean up" into nyc-mr1-dev am: ba3428f01b
...
am: 2581d13f25
* commit '2581d13f25878caf6011a2498b869d1dc84115ca':
cold sim clean up
Change-Id: Ie35dd1dbede46a1ae6f6a1c902e8d54321325500
2016-06-04 05:58:44 +00:00
fionaxu
2581d13f25
Merge "cold sim clean up" into nyc-mr1-dev
...
am: ba3428f01b
* commit 'ba3428f01b8cc112cd85d1c4ffcc1407a3b8b7c6':
cold sim clean up
Change-Id: I5a2e24d997408badd6db7576b2fa206eb9e5c4ca
2016-06-04 05:53:44 +00:00
Chen Xu
ba3428f01b
Merge "cold sim clean up" into nyc-mr1-dev
2016-06-04 05:48:47 +00:00
Michael Wright
e051f6f1fd
Rename PointerIcon and Pointer Capture APIs
...
This is a response to API council feedback.
Bug: 26830970
Change-Id: I1be541a53e3943d06640169671824f7daea15462
2016-06-04 02:20:21 +01:00
Selim Cinek
d8cbcf0c9a
Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev am: 6c94972622 am: 6efad815c2
...
am: 3eec7d66de
* commit '3eec7d66dedfc7f769cf154bd1a8a93b3e94460b':
Fixed a bug where talkback couldn't scroll through notifications
Change-Id: I78e79d6a596dddf3a4a2f7a48b97cc7ee3998127
2016-06-04 00:00:27 +00:00
Selim Cinek
3eec7d66de
Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev am: 6c94972622
...
am: 6efad815c2
* commit '6efad815c2fc81416d17521a547407dec0528a58':
Fixed a bug where talkback couldn't scroll through notifications
Change-Id: I4cbe2a13cd2a05dd9c550a0499e72ef5035b92c1
2016-06-03 23:22:01 +00:00
Selim Cinek
6efad815c2
Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev
...
am: 6c94972622
* commit '6c94972622a5fa6c2f0beb16f190015e81584013':
Fixed a bug where talkback couldn't scroll through notifications
Change-Id: I41bf71eabe7ab90cd93df33c28ac07ad5abd8354
2016-06-03 22:18:16 +00:00
Selim Cinek
f7b21e1db0
Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev
...
am: 6c94972622
* commit '6c94972622a5fa6c2f0beb16f190015e81584013':
Fixed a bug where talkback couldn't scroll through notifications
Change-Id: I66de0c19d02ef87cdb183c1d3f55ca7f6451cab8
2016-06-03 20:51:49 +00:00
Selim Cinek
6c94972622
Merge "Fixed a bug where talkback couldn't scroll through notifications" into nyc-dev
2016-06-03 20:39:25 +00:00
Selim Cinek
38d429f439
Handled expandability and swiping while guts are exposed
...
Also fixed a bug where the wrong guts were selected with groups.
Change-Id: I3677ce549b2a90e2dc225470cff4e2548ddca81a
Fixes: 29046865
2016-06-03 12:12:04 -07:00
fionaxu
1bf6ec2f86
cold sim clean up
...
- add a new field: provisioningNotificationEnabled from NetworkMisc. set
to false if we want to hide "sign in" notification and placed
carrier-specific notification instead. it is set on connect, once set,
it is carrier-app's responsibility to post new UI to users
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support
Bug: 28567303
Change-Id: Ic84db7ffbb920d15344717f104496d3cb82e1a85
2016-06-03 11:45:12 -07:00
Sudheer Shanka
ad79049c54
Disable some QS functionality in retail demo mode.
...
- Remove user switcher
- Remove edit functionality
- Remove some tiles
Change-Id: I5fb2a766dd044a5b5e40a5e3a39c4723bdc0df8b
Fixes: 29103713
2016-06-03 10:58:41 -07:00
Adrian Roos
bec2007236
Merge "Fix BigText transitions" into nyc-dev am: 2ab4f451dc am: 50844bc504
...
am: 3c8c89db25
* commit '3c8c89db25a8296b9bae450c4bfc1a31c25ebf08':
Fix BigText transitions
Change-Id: I64d22508c458db3b8b10359d4ac280986693f4b5
2016-06-03 16:18:39 +00:00
Adrian Roos
3c8c89db25
Merge "Fix BigText transitions" into nyc-dev am: 2ab4f451dc
...
am: 50844bc504
* commit '50844bc50429e6e6f4f0d33b177491c25f47e6ce':
Fix BigText transitions
Change-Id: I822241014f796954ee80e5d3ad2ba747f2ef1f03
2016-06-03 16:13:46 +00:00
Adrian Roos
50844bc504
Merge "Fix BigText transitions" into nyc-dev
...
am: 2ab4f451dc
* commit '2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
Fix BigText transitions
Change-Id: Ia211d3d625f2e28e7b756aadaab7b5594bbdb005
2016-06-03 15:53:09 +00:00
Adrian Roos
d49a86ceda
Merge "Fix BigText transitions" into nyc-dev
...
am: 2ab4f451dc
* commit '2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
Fix BigText transitions
Change-Id: I4705bacc68842c2a7ed178689e8efa53abc8e235
2016-06-03 15:53:07 +00:00
TreeHugger Robot
2ab4f451dc
Merge "Fix BigText transitions" into nyc-dev
2016-06-03 15:36:11 +00:00
Julia Reynolds
da766175e2
Don\'t leak guts. am: cdf98e1964 am: 0853233433
...
am: 1f8275e314
* commit '1f8275e3141f1b7c5150c6ffa26515c0701d8eba':
Don't leak guts.
Change-Id: I0fdb85d071409d28dca9325d36ee5ac88455fbd5
2016-06-03 13:58:53 +00:00