Andres Morales
864d13e2c9
[ConfirmCredential] fix issue where patterns of length 4 are not checked
...
Change-Id: I2bfcae01be88001a6a9bafa4908305d464522302
2015-05-27 13:04:38 -07:00
Chad Brubaker
227ba29e39
Merge "Clear only keystore credential entires" into mnc-dev
2015-05-27 20:04:14 +00:00
Andres Morales
b5746cb19b
Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev
2015-05-27 18:37:53 +00:00
Maurice Lam
6fd26aae0d
Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev
2015-05-27 18:35:09 +00:00
Jorim Jaggi
fd5ec09fe2
Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev
2015-05-27 18:33:26 +00:00
Geoff Mendal
41b0e87d9a
am fc05d801
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'fc05d8010230e410b4acbff6d629ef7b0834b265':
Import translations. DO NOT MERGE
2015-05-27 16:07:56 +00:00
Xiyuan Xia
d82fcc9dfe
am 4ae8b37c
: Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev
...
* commit '4ae8b37c58350209cd097eff2598aefda2441956':
Fix transient Next button in confirm screen on orientation change
2015-05-27 16:07:55 +00:00
Geoff Mendal
fc05d80102
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-05-27 15:57:53 +00:00
Xiyuan Xia
4ae8b37c58
Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev
2015-05-27 15:54:35 +00:00
Geoff Mendal
61ab32fdc6
Import translations. DO NOT MERGE
...
Change-Id: I0a30eee2e063e7246c04a289202d22a9f00dc94e
Auto-generated-cl: translation import
2015-05-27 08:54:34 -07:00
Jason Monk
4b34804b51
am 51334310
: Add no data usage string
...
* commit '51334310a26a29d3ac3ad4e7299110b6de0ae75c':
Add no data usage string
2015-05-27 14:03:06 +00:00
Jason Monk
51334310a2
Add no data usage string
...
Add a no data usage string so we can avoid showing incorrect dates
when no data is available.
Bug: 21076561
Change-Id: I4568cd750fe5f973fed0ff4ffa48412d8c6afd97
2015-05-27 09:02:16 -04:00
The Android Automerger
0ef7ba5a57
merge in mnc-release history after reset to mnc-dev
2015-05-27 01:03:10 -07:00
Jorim Jaggi
bc68ba22f1
Cancel enrollment when navigating out of enrollment
...
Change-Id: Ifee1572189765cbfa4c23e6176831c8f729bbd2b
2015-05-26 17:52:01 -07:00
Xiyuan Xia
3d36f54abc
am a4e0492c
: Merge "No auto soft keyboard when fp is in use" into mnc-dev
...
* commit 'a4e0492c11fb7b02c9a536ea4935e649e97c8c2d':
No auto soft keyboard when fp is in use
2015-05-26 21:14:38 +00:00
Xiyuan Xia
a4e0492c11
Merge "No auto soft keyboard when fp is in use" into mnc-dev
2015-05-26 21:05:27 +00:00
Xiyuan Xia
22e1ef222a
Fix transient Next button in confirm screen on orientation change
...
During orientation change, input method service could have stale
input editor info. The portrait mode password entry allows fullscreen
UI and it is made visible for a glimpse of second during the change.
This CL adds the flagNoFullscreen to portrait mode password entry
so that the transient switch to fullscreen UI does not happen.
Bug:21073469
Change-Id: Ie9d21e46f88ad0395afb8750ab5d19e938685b89
2015-05-26 13:39:03 -07:00
Jason Monk
ec39177c2b
am 44fb627c
: Merge "Don\'t have app info pages load so much info" into mnc-dev
...
* commit '44fb627cf67dfa3b9c2c625fd39ca8e9a9829813':
Don't have app info pages load so much info
2015-05-26 20:30:23 +00:00
Jason Monk
44fb627cf6
Merge "Don't have app info pages load so much info" into mnc-dev
2015-05-26 20:20:38 +00:00
Jason Monk
646befdd16
Don't have app info pages load so much info
...
They don't need to resume the ApplicationsState session because they
only need info for one app, instead just make sure ApplicationsState
can load the info as requested.
Bug: 20696893
Change-Id: I146387438348fad1396ac4528819b2f1a93a97bf
2015-05-26 16:20:09 -04:00
John Spurlock
d070d52a7b
am 90f5f4cb
: Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev
...
* commit '90f5f4cbd1099d2afe993fff0bc7c620a64f1576':
Settings: Display corp profile calendars in event rule selection.
2015-05-26 19:55:32 +00:00
John Spurlock
90f5f4cbd1
Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev
2015-05-26 19:41:55 +00:00
Jason Monk
49ad08e20f
am 1ecfc645
: Merge "Fix crash while rotating with app info dialog up" into mnc-dev
...
* commit '1ecfc645ee74ddcc7555f44291943f75581a4f8e':
Fix crash while rotating with app info dialog up
2015-05-26 19:29:22 +00:00
Jason Monk
1ecfc645ee
Merge "Fix crash while rotating with app info dialog up" into mnc-dev
2015-05-26 19:22:18 +00:00
Jason Monk
5e2529aeb4
Fix crash while rotating with app info dialog up
...
Bug: 21037445
Change-Id: Ie5b0f8aa04913d0ab781be334c6c305db97235a0
2015-05-26 15:12:18 -04:00
Sanket Padawe
86dbdff1fa
am 6d9500d0
: Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev
...
* commit '6d9500d04c64d05ad0b9b054c72b0e2fd1b866fc':
Fix generation of pin for WPS on screen rotation.
2015-05-26 18:58:07 +00:00
Sanket Padawe
6d9500d04c
Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev
2015-05-26 18:46:04 +00:00
Maurice Lam
dcf05e5cb6
[LockScreen] Setup Wizard pattern lock landscape layout
...
Create values-land/setup_choose_lock_pattern to implement the
landscape layout of the lock pattern. Also copied
values/setup_choose_lock_pattern to sw600dp so that this will be used
in tablet landscape.
Bug: 20916604
Change-Id: I6a2193c74dd10d79ed9e212cf51a625763d87e1a
2015-05-26 11:29:35 -07:00
Jason Monk
5b1c03293c
am 7231147b
: Merge "Unbanish memory screen and new UX" into mnc-dev
...
* commit '7231147b567aaf1c495eae569723c5dd7268c9e0':
Unbanish memory screen and new UX
2015-05-26 17:05:18 +00:00
John Spurlock
fa76a652e4
Settings: Display corp profile calendars in event rule selection.
...
And sort the accounts by display name.
Bug: 21155107
Change-Id: I8789022535ba7c66d950f5ec6f93c40ffb8106d3
2015-05-26 12:55:56 -04:00
Jason Monk
7231147b56
Merge "Unbanish memory screen and new UX" into mnc-dev
2015-05-26 16:55:42 +00:00
Jason Monk
3f058ca1c8
am e9866b6d
: Add permission summaries back in
...
* commit 'e9866b6dc47201630c057f946423d572b8c46af8':
Add permission summaries back in
2015-05-26 16:41:42 +00:00
Jason Monk
beb171d2e5
Unbanish memory screen and new UX
...
Give memory screen a makeover so that it looks nice enough to be
restored to its rightful home.
Bug: 20694769
Change-Id: I2f6933037b3fbbfb0d9fe5e3ca821ef59e171faa
2015-05-26 11:41:37 -04:00
Andres Morales
91e6c499ca
[LockSettings] pipe through HW throttle timeout
...
Bug: 21118563
Change-Id: I23f5af2ebef9dac981281fb04c055a02f3b159b8
2015-05-26 08:25:12 -07:00
Jason Monk
e9866b6dc4
Add permission summaries back in
...
Use broadcasts to ask the PackageInstaller about the number of
granted permissions.
Bug: 21078474
Change-Id: I91d88d145a803f5f6c3f3163ba1f4500d39b1943
2015-05-26 10:28:21 -04:00
The Android Automerger
c9d034b013
merge in mnc-release history after reset to mnc-dev
2015-05-26 01:03:14 -07:00
Geoff Mendal
eec237769a
am 85a72a90
: (-s ours) Import translations. DO NOT MERGE
...
* commit '85a72a9088d6be0cd0fda03d0e80a24a8fcaa4cb':
Import translations. DO NOT MERGE
2015-05-25 16:11:25 +00:00
Geoff Mendal
85a72a9088
Import translations. DO NOT MERGE
...
Change-Id: I60153a0868ea5ec670c3c3517ac032e616a1a0ef
Auto-generated-cl: translation import
2015-05-25 08:57:08 -07:00
Barnaby James
c54782071a
Fix TTS for Zen mode voice activity.
...
Don't finish activity until TTS has finished.
Incorrect TTS for mix of hours / mins - e.g. 1 hour 45 minutes.
Improve the description of TTS strings for translators.
BUG: 20248251
BUG: 21413212
BUG: 21411622
Change-Id: Id2693ea82b76492216147012216ba07ce75a9d12
2015-05-24 12:30:21 -07:00
The Android Automerger
55aff85432
merge in mnc-release history after reset to mnc-dev
2015-05-23 01:06:19 -07:00
Sean Francis-Lyon
19c39d275d
am 389cf343
: Merge "DO NOT MERGE show correct backup status" into mnc-dev
...
* commit '389cf343805c0d40af720a06ead6e92bdd512527':
DO NOT MERGE show correct backup status
2015-05-22 20:51:50 +00:00
Jason Monk
db006f8db4
String changes for app links in settings
...
Bug: 21372846
Change-Id: I76cc684c8f8f42555af36f754291d6ba99acb4e4
2015-05-22 13:46:06 -07:00
Sean Francis-Lyon
389cf34380
Merge "DO NOT MERGE show correct backup status" into mnc-dev
2015-05-22 20:38:41 +00:00
Maurice Lam
b2c02e2709
am df8d8907
: Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev
...
* commit 'df8d8907a867e4d93f42d0a305371124b4fd599d':
[WifiSetup] Align to mac address to locale start
2015-05-22 19:35:30 +00:00
Maurice Lam
db0e8b65e0
am 6fdd06dc
: Merge "[WifiSetup] Update phone illustrations" into mnc-dev
...
* commit '6fdd06dcfc82a246911b1b285b4b6e4f41d0b8fc':
[WifiSetup] Update phone illustrations
2015-05-22 19:35:29 +00:00
Maurice Lam
df8d8907a8
Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev
2015-05-22 19:33:19 +00:00
Maurice Lam
6fdd06dcfc
Merge "[WifiSetup] Update phone illustrations" into mnc-dev
2015-05-22 19:27:10 +00:00
Maurice Lam
cd3fbba9b7
[WifiSetup] Align to mac address to locale start
...
Set the textDirection of the mac address view to "locale" instead of
the inherited default of "firstStrong", so that the address itself is
always aligned with the label.
Bug: 21396886
Change-Id: I143ec069bde56d34484e8839c60386de268bb930
2015-05-22 11:59:43 -07:00
Jason Monk
cf55da1ef5
am b2f11d01
: String changes for app links in settings
...
* commit 'b2f11d013cc95ba9bebb62cdcbd06a3920872d24':
String changes for app links in settings
2015-05-22 18:51:34 +00:00
Jason Monk
b2f11d013c
String changes for app links in settings
...
Bug: 21372846
Change-Id: I76cc684c8f8f42555af36f754291d6ba99acb4e4
2015-05-22 14:42:45 -04:00