Commit Graph

20143 Commits

Author SHA1 Message Date
The Android Automerger
e7fedeeb0c merge in mnc-release history after reset to mnc-dev 2015-05-31 01:03:46 -07:00
Geoff Mendal
b777c6e205 Import translations. DO NOT MERGE
Change-Id: I2a83b506d2d5c74818178dbc76b07b2f97ff2c87
Auto-generated-cl: translation import
2015-05-30 17:28:38 -05:00
The Android Automerger
bf7e76293a merge in mnc-release history after reset to mnc-dev 2015-05-30 01:06:23 -07:00
Xiyuan Xia
dc6bd8d2f1 Merge "Ignore fp error message when not listening" into mnc-dev 2015-05-30 03:28:52 +00:00
Xiyuan Xia
f1bc6e52b5 Ignore fp error message when not listening
Bug:21413567
Change-Id: I66cde924f77d1df13a3cabd2b118439d59ef1d88
2015-05-29 16:19:29 -07:00
Fyodor Kupolov
097936ad1b Hide guest entry if the user is not allowed to create guest
Don't show the Guest entry for a secondary user if the user is not allowed to
create a guest and there is currently no guest already created.

Bug: 19035769
Change-Id: Icf4a778533affaec0658af4da5ce000eda261f38
2015-05-29 14:07:12 -07:00
Fyodor Kupolov
01f35ce46e Merge "Use DimmableIconPreference for Add user action" into mnc-dev 2015-05-29 20:42:55 +00:00
Fyodor Kupolov
2defc457bd Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev 2015-05-29 20:27:15 +00:00
Fyodor Kupolov
1c8600b0c8 Hide the collapse/expand icon if text fits the screen
Icon should be hidden if explanation text fits the screen, otherwise user
should be able to click the image to collapse/expand the text.

Bug: 20554398
Change-Id: I7fb06be6e6c195a5c1bcac504f4af2d67ef4211e
2015-05-29 11:21:42 -07:00
Tony Mantler
3e7f2b4458 Merge "Move ZoneGetter into SettingsLib" into mnc-dev 2015-05-29 16:44:48 +00:00
Geoff Mendal
d6242009d6 Import translations. DO NOT MERGE
Change-Id: I317a9af71a1ab755f032066f7239c6e1e2f6e5ec
Auto-generated-cl: translation import
2015-05-29 09:22:09 -05:00
John Spurlock
00e392387b Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev 2015-05-29 13:22:36 +00:00
John Spurlock
bd352af3cf Settings: Migrate zen event conditions to use calendar name.
And make sure any existing calendar value always appears in the
picker, even before it exists in the calendar provider.

Bug: 17755700
Change-Id: I8aa298a0d5804c288e2596f18c2dc7318f752121
2015-05-28 22:20:44 -04:00
Tony Mantler
550015e476 Move ZoneGetter into SettingsLib
Change-Id: Ia998ae0bd7fc4c974e03df7c8fc380d98a3e71de
2015-05-28 14:49:19 -07:00
Paul Lawrence
750648c5ae Merge "Disable back button on crypto screen" into mnc-dev 2015-05-28 19:37:28 +00:00
Jason Monk
7c3b9f28b5 Merge "Make use of WifiTracker's WorkerThread support" into mnc-dev 2015-05-28 16:37:39 +00:00
Jason Monk
7a0b412ed2 Make use of WifiTracker's WorkerThread support
Let the AccessPoint callbacks come in on a BG thread and do more
of the handling there.

Bug: 21486080
Change-Id: I529152d9f5c429b790a669b75b6d955ce4336caf
2015-05-28 12:26:09 -04:00
Jason Monk
a7fe759de7 Merge "More memory updates" into mnc-dev 2015-05-28 14:24:35 +00:00
Jason Monk
ab2046aa76 More memory updates
- Some string changes
 - Make processes in memory details not clickable
 - Put processes in a 'detail' category
 - Hide processes when an app only has 1
 - Add memory item to bottom of app info page

Bug: 20694769
Change-Id: Ifbe2205aeef230e44752d075578524249b30bdf8
2015-05-28 10:20:56 -04:00
John Spurlock
9dbd616541 Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev 2015-05-28 14:11:10 +00:00
John Spurlock
e6f9c110c7 Settings: Update icon sizes for zen auto rules.
Bug: 21474291
Change-Id: I5f2ec0e86f9390ee9c73e4a1be6bc280162b1cab
2015-05-28 10:07:29 -04:00
Jason Monk
15dcebe1e7 Help fallbacks and intent work
- Handle a backup URI, so that if the specified URI is not available,
   another can be used.
 - Add some data to help intents when they are intent URIs
 - Fill in the context with a classname when it isn't present

Bug: 15475009
Change-Id: I7050fa61121901929e650b20bd7a0ae21e8ba207
2015-05-28 09:50:45 -04:00
The Android Automerger
5c98bd19da merge in mnc-release history after reset to mnc-dev 2015-05-28 01:05:19 -07:00
Sanket Padawe
ecf4339bc7 Fix Eap method selection on screen rotation.
Bug: 19903254
Change-Id: I84322a785f9a4121c7885ada889a04129590e4ed
2015-05-27 18:04:23 -07:00
Paul Lawrence
90e9a90312 Merge "Honor password visible setting in CryptKeeper" into mnc-dev 2015-05-27 22:15:51 +00:00
Andres Morales
27c13e5dc6 Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev 2015-05-27 20:59:28 +00:00
Paul Lawrence
2a6552ed50 Disable back button on crypto screen
The back button cannot do anything from this activity as it is
only ever launched first thing at boot. So do not permit going back.

Note that screens launched from here (emergency dialer, keyboard config)
still work and their back buttons still work.

Bug: 20730074
Change-Id: I939e05450e5fbd61d12890325c4afe9dcad35c1e
2015-05-27 20:34:14 +00:00
Paul Lawrence
c04420ce25 Honor password visible setting in CryptKeeper
Requires matching framework change:
  https://googleplex-android-review.git.corp.google.com/#/c/692822/

Bug: 20184626
Change-Id: I04bfb9ed61a7b40fbc28fbc0b4b10bf848b34a2c
2015-05-27 20:33:46 +00:00
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
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
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
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
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
90f5f4cbd1 Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev 2015-05-26 19:41:55 +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
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
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