Maurice Lam
d85fafce30
Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
2015-07-21 00:38:39 +00:00
Maurice Lam
d10026cbfd
Merge "[Fingerprint] Change message in encryption" into mnc-dev
2015-07-21 00:25:16 +00:00
Maurice Lam
af57ec8831
Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
2015-07-21 00:22:03 +00:00
Maurice Lam
5cceb312fd
[ScreenLock] Change title for RedactionInterstitial
...
Change the title for RedactionInterstital to "Notifications".
Bug: 22587892
Change-Id: Ib0e32fa8913924ae74aa412703a5f6234fd62fe4
2015-07-20 23:42:52 +00:00
Jim Miller
3977df037c
Merge "Don't launch ConfirmDeviceCredentials multiple times." into mnc-dev
2015-07-20 22:50:30 +00:00
Jim Miller
0c6e18f24d
Don't launch ConfirmDeviceCredentials multiple times.
...
Fixes bug 18724944
Change-Id: Ifd93b1632f120a2d17136b3100e2563fbb45b9a5
2015-07-20 22:38:02 +00:00
Geoff Mendal
1992d5a1fc
Import translations. DO NOT MERGE
...
Change-Id: I1a4e18120641388458b5f90a531978292f307bc6
Auto-generated-cl: translation import
2015-07-20 15:33:59 -07:00
Maurice Lam
15546c0b9d
[ScreenLock] Change title of encryption interstitial
...
Change the title of EncryptionInterstitial to "Secure start-up".
Bug: 22587892
Change-Id: I30b9625bb2da666cd5e229445ad369fe72faad51
2015-07-20 15:23:41 -07:00
Maurice Lam
c0e7879684
[Fingerprint] Change message in encryption
...
Change the message for encryption interstitial when enrollin
fingerprint, to make it clear that fingerprint unlock is still used,
just that the backup unlock PIN / password / pattern will be needed
to start the device.
Bug: 22559146
Change-Id: Ia134e0d9b118151833a9118ff44667dcc9122185
2015-07-20 21:52:12 +00:00
Makoto Onuki
4dd637a07e
Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
2015-07-20 20:35:09 +00:00
Jason Monk
178c40998d
Merge "Handle monkey crash" into mnc-dev
2015-07-20 20:32:29 +00:00
Jason Monk
bd45c3cbe0
Handle monkey crash
...
Don't create dialog if we don't have one to create, and make sure
that storage-related prefs are removed when they aren't needed.
Bug: 22571238
Change-Id: I452cbf75313cd14572fc7b57bd6164292cf17209
2015-07-20 13:40:40 -04:00
Christopher Tate
b852fcbde9
Merge "Offer 'ask' as an available app-linking state" into mnc-dev
2015-07-20 17:06:27 +00:00
Christopher Tate
2eda36509f
Offer 'ask' as an available app-linking state
...
Bug 22532193
Change-Id: I5bb43b1b8d84af1901f99fb10dd899c260d94c99
2015-07-17 16:11:41 -07:00
Jim Miller
bf9a425d5c
Merge "Simplify FingerprintSettings" into mnc-dev
2015-07-17 21:05:07 +00:00
Jim Miller
8e83475024
Simplify FingerprintSettings
...
There's no need for FingerprintSettings to retry fingerprint
any more often than these cases: 1. authentication success,
2. authentication error and 3. when the activity resumes.
Fixes bug 22438498
Change-Id: I87841e9916cfc9e6c64cd1df009b9a9c765f87d0
2015-07-17 21:03:42 +00:00
Julia Reynolds
0c03b50a02
Merge "Remove blank switchtext from switch preferences." into mnc-dev
2015-07-17 20:11:27 +00:00
Billy Lau
90a8a01b62
Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
2015-07-17 18:28:28 +00:00
Billy Lau
f8f9802104
Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
...
Overall, fixed the detection of the state of permission in the corresponding UX
to be more accurate. Also ensured that apps can actually launch the summary UX
through a custom intent.
AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.
strings:
Made changes to strings so that wordings are uniform everywhere and raised the
char limit due to requests from translators.
Change-Id: Ia03403641ad53bd1a33b84dae6db1739cfcf9d60
2015-07-17 18:23:57 +01:00
Christopher Tate
ddaa142a09
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
...
Bug 22504009
Change-Id: I19ded70cf17936504a2a1becea2684d87952dff6
2015-07-16 16:07:12 -07:00
Makoto Onuki
26cf58aba6
Fix ugly text wrapping on non-english locales
...
Bug 22284618
Change-Id: Iaab017fa5d2f5aeb3457f911cbd31ceb8671e495
2015-07-16 15:45:09 -07:00
Julia Reynolds
16eec50576
Remove blank switchtext from switch preferences.
...
This makes TTS services read the default text (on/off) when
these switches are toggled.
Bug: 22530662
Change-Id: I77c5918481faa6309995aa385dcfc3608fc94298
2015-07-16 13:28:16 -04:00
Kenny Guy
705faddbb3
Merge "Show disabled trust agents as off." into mnc-dev
2015-07-16 12:42:41 +00:00
Sanket Padawe
046decca29
Merge "Use common xml file for multi-tab settings." into mnc-dev
2015-07-16 05:01:27 +00:00
Maurice Lam
bec1d29558
Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
2015-07-16 02:19:19 +00:00
Jason Monk
509726054a
Merge "Disable ignore battery optimization items that can't change" into mnc-dev
2015-07-15 22:48:13 +00:00
Jason Monk
4a6b909559
Merge "Change move storage from dropdown pref to dialog" into mnc-dev
2015-07-15 22:48:06 +00:00
Jason Monk
e8400c2fb7
Change move storage from dropdown pref to dialog
...
Use a horizontal pref and a single button that triggers the dialog
Bug: 21922660
Change-Id: Ifb4de75ca9269d2e8163eec5602932260adec0d9
2015-07-15 16:59:28 -04:00
Maurice Lam
4595978b72
Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
2015-07-15 19:28:06 +00:00
Jason Monk
443513cc0d
Disable ignore battery optimization items that can't change
...
Bug: 22507803
Change-Id: Ia33746dc569f4d9f96242a502e54bcc8eb47bf12
2015-07-15 15:22:38 -04:00
Jim Miller
6b9d788914
Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
2015-07-15 19:18:06 +00:00
Maurice Lam
f90628c6ec
Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev
2015-07-15 18:45:34 +00:00
Maurice Lam
8d1f9c9be5
[Fingerprint] Add fingerprint enroll in setup wizard
...
Make a subclass for each enrolling screen that setup wizard uses, and
in override the corresponding get*Intent methods to always use the
setup wizard versions of the next screens.
On minor change made to the original flow is that it will now return
RESULT_OK if it is finished, as opposed to RESULT_CANCELED.
Bug: 21695577
Change-Id: Id666826e8027272ede6a5426967d66fb291670a4
2015-07-15 11:14:22 -07:00
Maurice Lam
e1eaed079c
[Fingerprint] Export FingerprintEnrollIntroduction
...
Export FingerprintEnrollIntroduction activity under the permission
MANAGE_FINGERPRINT so that setup wizard can start it.
Bug: 21695577
Change-Id: If466c6e484a4aa0c10382cfedab0aad10ae26702
(cherry picked from commit 052297172e
2015-07-15 11:09:25 -07:00
Selim Cinek
854d08be2b
Fixed the layout for the fingerprint renaming
...
Bug: 21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
(cherry picked from commit abd67de1ad
2015-07-15 17:37:46 +00:00
Kenny Guy
9854dfaf1d
Show disabled trust agents as off.
...
When trust agents are disabled by the admin
show the greyed out toggle as off.
Bug: 22397930
Change-Id: I687a5dee0ca9bed5015a4af080270f7bafa5a37d
2015-07-15 16:12:34 +00:00
Jason Monk
cd075edf6d
Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
2015-07-15 14:54:04 +00:00
Geoff Mendal
f3907176da
Import translations. DO NOT MERGE
...
Change-Id: I0bd7d5fb307ffa5fd3b001eaf5cf7697168e90d6
Auto-generated-cl: translation import
2015-07-15 06:56:45 -07:00
xinhe
d7fb46de59
Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
2015-07-14 22:29:32 +00:00
xinhe
cbdcca6cf6
Need to disable 5GHz bands for WiFi tethering in Japan
...
b/22396383
Change-Id: I99090f28eff1b232ebba89ff638e37be82a3f21b
2015-07-14 14:39:43 -07:00
Jim Miller
e641e7d706
Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev
2015-07-14 21:02:02 +00:00
Jason Monk
acc70a3a32
Merge "Add content description to wifi networks" into mnc-dev
2015-07-14 20:20:40 +00:00
Jason Monk
f05248f88f
Fix Help menu for PrivateVolumeSettings
...
Call super.onCreateOptionsMenu so that the auto help stuff can
work properly.
Bug: 22202745
Change-Id: Iee6b4a81574c7e981290465a78641f3c5b06c143
2015-07-14 15:00:22 -04:00
Billy Lau
52df60d83d
Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
2015-07-14 18:22:30 +00:00
Sanket Padawe
c06f9b6721
Use common xml file for multi-tab settings.
...
Bug: 22360525
Change-Id: Id4d971e0afcd9ecd43005a0a5056ad03a32b704f
2015-07-14 11:13:43 -07:00
Jason Monk
2ecd295d56
Add content description to wifi networks
...
Bug: 22468835
Change-Id: Ifd9d0384030befbd221b14599159348bf56d41c8
2015-07-14 14:00:07 -04:00
Jorim Jaggi
8505d4a51d
Merge "Disable voice input if assist is voice service" into mnc-dev
2015-07-14 17:50:34 +00:00
Jason Monk
7713fe26d2
Merge "Disable notification volume when user restricted" into mnc-dev
2015-07-14 13:53:29 +00:00
Martijn Coenen
8d9bb1ae1d
Merge "Fix up Tap and Pay how it works." into mnc-dev
2015-07-14 07:45:01 +00:00
Jorim Jaggi
0798ef0523
Disable voice input if assist is voice service
...
Bug: 22358252
Change-Id: Id4a9de8c5287c5e025d0ccc7f98edd8855db519c
2015-07-14 04:13:57 +00:00
