Jorim Jaggi
7fd12db350
Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev automerge: 3c7efdc
...
automerge: 61059fe
* commit '61059fe82ca43adcd34ab8f48201a8925dcec164':
Only hide sensitive content when Keyguard is showing
2014-11-04 00:05:04 +00:00
Jorim Jaggi
61059fe82c
Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev
...
automerge: 3c7efdc
* commit '3c7efdc00506e6561ca08933f0b2acf5e3f16b02':
Only hide sensitive content when Keyguard is showing
2014-11-03 23:27:18 +00:00
Jorim Jaggi
3c7efdc005
Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev
2014-11-03 22:38:34 +00:00
Jim Miller
a3a0cd7f90
am ff25dd06: am 12b239e6: Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev
...
* commit 'ff25dd06a3d8c0ba3bade95c67720612cfb04ef3':
Fix SetupWizard black screen issue for EDU devices
2014-11-03 22:31:31 +00:00
Jorim Jaggi
ec705c2c58
Only hide sensitive content when Keyguard is showing
...
isOccluded is set delayed when unlocking the phone from a
notification, so updatePublicMode used a stale state. Now, only
the fact whether the Keyguard is showing (no matter if occluded or
not) is used to determine the public mode, which is set in a
synchronous manner.
Bug: 18026898
Change-Id: I3e4988f3e806cf15616ee5aa452f81f19d4aa716
2014-11-03 22:08:05 +01:00
Jim Miller
ff25dd06a3
am 12b239e6: Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev
...
* commit '12b239e6d39ad5a35f68e7bcd5f644a793b5cb74':
Fix SetupWizard black screen issue for EDU devices
2014-11-03 20:00:43 +00:00
Jim Miller
12b239e6d3
Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev
2014-11-03 19:51:53 +00:00
Geoff Mendal
6bdbebadad
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-11-03 17:52:57 +00:00
Geoff Mendal
ef8c3cc4f6
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-11-03 17:52:11 +00:00
Geoff Mendal
b47c651ef7
Import translations. DO NOT MERGE
...
Change-Id: Ic1fb3518c1b06345d69abacb9164ae4a52dcf270
Auto-generated-cl: translation import
2014-11-03 09:07:58 -08:00
Geoff Mendal
d2c26c9d7f
Import translations. DO NOT MERGE
...
Change-Id: I21e1890c7ff4490469fb0243df69b560db9b29b6
Auto-generated-cl: translation import
2014-11-03 09:06:30 -08:00
Adrian Roos
670edcb535
am 862d72e2: Merge "Improve dump of status bar service" into lmp-mr1-dev
...
automerge: 8af07f4
* commit '8af07f4717359c8421bc91c8171fcf749714b08f':
Improve dump of status bar service
2014-11-03 15:02:09 +00:00
Adrian Roos
8af07f4717
am 862d72e2: Merge "Improve dump of status bar service" into lmp-mr1-dev
...
* commit '862d72e2f4e600d6188f5a21a906d5374ab4f123':
Improve dump of status bar service
2014-11-03 15:00:43 +00:00
Christoph Studer
635d36fd49
am f3aa1c8d: Merge "SysUI: Use mScreenOnFromKeyguard for panel visibility" into lmp-mr1-dev
...
automerge: d99ae19
* commit 'd99ae19303105ab7ba3df1907e1537157d6889e1':
SysUI: Use mScreenOnFromKeyguard for panel visibility
2014-11-03 14:57:39 +00:00
Adrian Roos
862d72e2f4
Merge "Improve dump of status bar service" into lmp-mr1-dev
2014-11-03 14:56:48 +00:00
Christoph Studer
d99ae19303
am f3aa1c8d: Merge "SysUI: Use mScreenOnFromKeyguard for panel visibility" into lmp-mr1-dev
...
* commit 'f3aa1c8d7915afd51d21bf79feb2285dffcc3827':
SysUI: Use mScreenOnFromKeyguard for panel visibility
2014-11-03 14:55:06 +00:00
Christoph Studer
f3aa1c8d79
Merge "SysUI: Use mScreenOnFromKeyguard for panel visibility" into lmp-mr1-dev
2014-11-03 14:49:17 +00:00
Jason Monk
8efeae7eb4
am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev
...
automerge: 5c69f5b
* commit '5c69f5b276b65bd4b8000d2b6e56baddccf89846':
Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
2014-11-03 14:42:18 +00:00
Jason Monk
5c69f5b276
am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev
...
* commit '2e647efe01dcdb82d2d7f8a23540ba6b690a95d6':
Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
2014-11-03 14:41:07 +00:00
Jason Monk
2e647efe01
Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev
2014-11-03 14:36:02 +00:00
Jim Miller
b256e4e209
Fix SetupWizard black screen issue for EDU devices
...
This fixes a problem where EDU devices show a black screen if
the device is rebooted after setting a pin/pattern/password but
before completing SetupWizard.
The issue is that the system doesn't expect to see a state
where the device is not provisioned but has a pin/pattern/password
because it wasn't possible before. With the addition of the ability
for EDU devices to add a pin/pattern/password, we can now get
into this unforseen state.
The fix ignores provisioning if a password is set so that the
user can reach the security screen to unlock the device and
continue with SetupWizard.
Fixes bug 18022051
Change-Id: Ie88a75530d964c02458c25866f0629877214edf4
2014-10-31 18:06:40 -07:00
Svet Ganov
28d51a39a1
am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev
...
automerge: 4f5b8a6
* commit '4f5b8a6b9b1966b42c929f89e1e91827ec495719':
Crash apps that print malformed or password protected PDFs.
2014-11-01 00:27:30 +00:00
Svet Ganov
4f5b8a6b9b
am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev
...
* commit '182f0a136fca2bff1614cee41178d2052e7dcf61':
Crash apps that print malformed or password protected PDFs.
2014-11-01 00:26:18 +00:00
Svet Ganov
fce84f035c
Crash apps that print malformed or password protected PDFs.
...
If apps are writing malformed content (typically not a PDF file) or if the
PDF content they provide to the print system is password protected, are now
crashed as both of these are app bugs.
bug:17636435
Change-Id: Ifce6a3199e587448dd38f6a84290a965c24b698b
2014-11-01 00:06:08 +00:00
Svetoslav
2a6749adc0
am 93134ce8: Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev
...
automerge: 160021d
* commit '160021d8cf62f566587d899498c72fff82b6969f':
Save to a PDF file should look like print preview.
2014-10-31 19:59:53 +00:00
Svetoslav
160021d8cf
am 93134ce8: Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev
...
* commit '93134ce87e7b33e599c9ef9ed8b19ec2556ca8f1':
Save to a PDF file should look like print preview.
2014-10-31 19:57:23 +00:00
Svetoslav
93134ce87e
Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev
2014-10-31 19:54:05 +00:00
Chris Wren
bbe8c74f6b
am b9144cea: Merge "Clear the initialized flag when resetting the height." into lmp-mr1-dev
...
automerge: c5f1ee3
* commit 'c5f1ee3dd144799b92b7c41286e2512b09f364d9':
Clear the initialized flag when resetting the height.
2014-10-31 19:39:12 +00:00
John Spurlock
e7eadc4635
am 404658ee: Merge "Update 1-bar status bar / qs icons." into lmp-mr1-dev
...
automerge: 44c534d
* commit '44c534d88ae1153c8d29cee27de4131cd7215273':
Update 1-bar status bar / qs icons.
2014-10-31 19:37:46 +00:00
Chris Wren
c5f1ee3dd1
am b9144cea: Merge "Clear the initialized flag when resetting the height." into lmp-mr1-dev
...
* commit 'b9144cea5184c90534db75b47e3818a688e64d5b':
Clear the initialized flag when resetting the height.
2014-10-31 19:15:20 +00:00
Chris Wren
b9144cea51
Merge "Clear the initialized flag when resetting the height." into lmp-mr1-dev
2014-10-31 19:10:53 +00:00
John Spurlock
44c534d88a
am 404658ee: Merge "Update 1-bar status bar / qs icons." into lmp-mr1-dev
...
* commit '404658eee9ec7c84dc070b018d7fcfa94bb8f83f':
Update 1-bar status bar / qs icons.
2014-10-31 19:05:12 +00:00
John Spurlock
404658eee9
Merge "Update 1-bar status bar / qs icons." into lmp-mr1-dev
2014-10-31 19:01:17 +00:00
Chris Wren
310df3127a
Clear the initialized flag when resetting the height.
...
When the notification was updated within the heads up, touches were being
dropped due to an invalid actual height, after a height reset in the update code.
Bug: 18102199
Change-Id: I6c95d360452665464a868b2bc5ce4f6e104b6652
2014-10-31 18:55:39 +00:00
John Spurlock
fd9aa5ff03
Update 1-bar status bar / qs icons.
...
To make the difference from 2-bars more pronounced.
Also fix a tragic regression in status bar demo icon scale.
Bug: 18019421
Change-Id: I4f4e3fea3ed07de5705ea7a1420deb4ccaa398b0
2014-10-31 14:51:54 -04:00
Jason Monk
94cfd9d7c4
Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
...
To prepare for controlling from settings.
While here, add lock to app settings to backups.
Bug: 16957435
Change-Id: I059140cd07a7a0d5ceb4e0bfe5e0176cb96629d3
2014-10-31 14:47:13 -04:00
Svetoslav
bec22beb99
Save to a PDF file should look like print preview.
...
When rendering a PDF file for print preview we take into account
the selected print options such as paper size, orientation, etc
without modifying the document. To print we send the doc in its
original form and the print options so the print service can apply
the necessary transforms in addition to the optional custom options
it supports. When saving to PDF we have to actually change the
document as we act as a print service.
bug:13545980
Change-Id: Icdcecf962bec6ff742cc6015df5af9d9086ce760
2014-10-31 10:41:34 -07:00
Jorim Jaggi
eab1d45ee3
am 06a0c3a4: Implement nice transition for unlocking while QS is open
...
automerge: d604794
* commit 'd6047940cd2c0235c53c02b620910ff59a966618':
Implement nice transition for unlocking while QS is open
2014-10-31 16:19:41 +00:00
Jorim Jaggi
d6047940cd
am 06a0c3a4: Implement nice transition for unlocking while QS is open
...
* commit '06a0c3a4459de084ecf8f1a8920edf36c41ac164':
Implement nice transition for unlocking while QS is open
2014-10-31 16:10:29 +00:00
Jorim Jaggi
06a0c3a445
Implement nice transition for unlocking while QS is open
...
Also allow to swipe from the very bottom on Keyguard to close both
QS and notifications, to have the same behavior like in the normal
shade.
Bug: 18167287
Change-Id: I2150ac5834efe1061ca8c8d32815a481c0796c97
2014-10-31 16:45:59 +01:00
Selim Cinek
067d887706
am aed002f8: Merge "Fixed a bug with the notification appear animation" into lmp-mr1-dev
...
automerge: 0f22af9
* commit '0f22af9955f23a02ff2413556823f5708d8d967b':
Fixed a bug with the notification appear animation
2014-10-31 15:23:13 +00:00
Selim Cinek
0f22af9955
am aed002f8: Merge "Fixed a bug with the notification appear animation" into lmp-mr1-dev
...
* commit 'aed002f85c4e8ad76ff5b21b9d5216e827fca454':
Fixed a bug with the notification appear animation
2014-10-31 15:21:40 +00:00
Selim Cinek
1250aa31af
am 69d7dfd4: Merge "Mirrored clear all animation for RTL" into lmp-mr1-dev
...
automerge: 0bda775
* commit '0bda775be5619ae634d5feb8049e9b4a14a93dad':
Mirrored clear all animation for RTL
2014-10-31 15:18:40 +00:00
Selim Cinek
aed002f85c
Merge "Fixed a bug with the notification appear animation" into lmp-mr1-dev
2014-10-31 15:17:21 +00:00
Selim Cinek
0bda775be5
am 69d7dfd4: Merge "Mirrored clear all animation for RTL" into lmp-mr1-dev
...
* commit '69d7dfd4502aee139b6de26f235c21366ebb659f':
Mirrored clear all animation for RTL
2014-10-31 15:17:19 +00:00
Selim Cinek
69d7dfd450
Merge "Mirrored clear all animation for RTL" into lmp-mr1-dev
2014-10-31 15:13:02 +00:00
Selim Cinek
bb3d1cf11d
Fixed a bug with the notification appear animation
...
This happened since the switch animation was running
even when invisible. This is fixed now and only
runs when the view is actually shown.
Bug: 18168562
Change-Id: I7fa2254411d249c23cd623cdff64524729f0817c
2014-10-31 16:11:53 +01:00
Selim Cinek
1d59af45f6
Mirrored clear all animation for RTL
...
Also automirrored the icon.
Bug: 18173905
Change-Id: I510efaf18b89a676959d72ad1b9e9a8edd417e60
2014-10-31 16:11:40 +01:00
Selim Cinek
d3a92f9f02
am af2442e9: Merge "Fixed a bug that the panel was not closable in the locked shade" into lmp-mr1-dev
...
automerge: 03a2cff
* commit '03a2cffb4b976ad00cf1dfb20bfc0a19863e9828':
Fixed a bug that the panel was not closable in the locked shade
2014-10-31 15:11:10 +00:00
Selim Cinek
17c2336c94
am ac457b1b: Merge "Fixed a crash in the Notification expandHelper" into lmp-mr1-dev
...
automerge: 3804ebf
* commit '3804ebfbf9764a32d3d7e79ac95f3995db5e5117':
Fixed a crash in the Notification expandHelper
2014-10-31 15:10:07 +00:00