Commit Graph

21520 Commits

Author SHA1 Message Date
Jason Monk
e2840f1ce3 am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '838c843217c76418e5f65b38f40e6b39760de1e4':
  Remove tuner from development settings
2015-07-23 18:27:32 +00:00
Maurice Lam
2f2779acce am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '32b96646eec917987fdd38208c6b11a9bc8832d3':
  [ScreenLock] Style encryption interstitial in SUW
2015-07-22 20:17:37 +00:00
Maurice Lam
9dd92338d0 am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
* commit '3c1f46dc2c3d6b0a9c0c39d0cc327380a3f8f078':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
2015-07-22 20:17:34 +00:00
Maurice Lam
899d0a2894 am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit 'e44ceed122aa06482bf03d58eba91536a29e4158':
  [ScreenLock] Update illustration during setup wizard
2015-07-22 20:17:33 +00:00
Jason Monk
838c843217 Merge "Remove tuner from development settings" into mnc-dev 2015-07-22 19:29:59 +00:00
Maurice Lam
32b96646ee Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 2015-07-21 23:40:02 +00:00
Maurice Lam
3c1f46dc2c Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 2015-07-21 23:39:35 +00:00
Maurice Lam
e44ceed122 Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev 2015-07-21 23:38:34 +00:00
Maurice Lam
da433902d4 [Fingerprint] Send RESULT_CANCELED when back from Add another
Forward the result in the enrolling screen from the finish screen,
so that if the user presses back in "Add another" after enrolling
the first fingerprint, it will return RESULT_CANCELED instead of
RESULT_FINISHED, and go back to find sensor screen.

This results in the following behavioral changes:
- RESULT_FINISHED will only be sent if the user presses "Done" in
  FingerprintEnrollFinish. If the user clicks back in
  FingerprintEnrollEnrolling, they will always go back to the
  previous screen with RESULT_CANCELED, which would either be
  FindSensor or FingerprintSettings.
- If the user presses back in FingerprintEnrollFinish, which is only
  possible outside of Setup Wizard, they will be back in Find Sensor,
  and pressing next will enroll an additional fingerprint.
  - Edge case: if the user enrolled the maximum number of
    fingerprints, and presses back, they will be bounced all the way
    back to Settings > Security.

Bug: 22552741
Change-Id: Ifc5e8a9150491b4303e01ebd0fc17b6d39dd372d
2015-07-21 15:23:11 -07:00
Billy Lau
3d861fd129 am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit 'd06ba151f5cc966bf05b2ac0146602d31ae81c4a':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
2015-07-21 17:54:01 +00:00
Billy Lau
d06ba151f5 Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 2015-07-21 17:37:08 +00:00
Amit Mahajan
c1d2289bc6 am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit 'e8357caad8880deb23dc04ad5d4d036d41a1ae9f':
  Fix bug to force to close once change Bearer on APN
2015-07-21 17:11:00 +00:00
Amit Mahajan
e8357caad8 Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev 2015-07-21 16:57:13 +00:00
Billy Lau
bb3aa2632a Bug 21589105 Rescope WRITE_SETTINGS (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 needing this capability can
launch the summary UX through a specific intent.

AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.

strings.xml:
Increased the CHAR limits for some strings due to requests from translators.

Change-Id: Ie64f86e034867ed582c1c583a5e8f84671fa4d63
2015-07-21 17:44:49 +01:00
Julia Reynolds
cb271219c3 am f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit 'f516e7dde0074416dbf51650cbfb9cc763027b27':
  Make 'fingerprint' searchable in Settings.
2015-07-21 15:30:45 +00:00
Julia Reynolds
f516e7dde0 Make 'fingerprint' searchable in Settings.
Bug: 22511754
Change-Id: I1e145ca9a33eb336014a8a4e158e9196a91cfdcc
2015-07-21 14:28:40 +00:00
Maurice Lam
7e83103020 [ScreenLock] Style encryption interstitial in SUW
When running in setup wizard, style the encryption interstitial using
styles from Setup Wizard library, to be consistent with the rest of
the setup flow.

Bug: 22587892
Change-Id: I3787643139ec4189f16e0046875fe3a688c8060b
2015-07-20 21:06:21 -07:00
Maurice Lam
c97e5aba84 am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit 'd85fafce30f6fb71ea9de9de3c6d8aafc99dba33':
  [ScreenLock] Change title of encryption interstitial
2015-07-21 00:50:32 +00:00
Maurice Lam
d85fafce30 Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev 2015-07-21 00:38:39 +00:00
Maurice Lam
a33b68af3e am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit 'd10026cbfde671448b702fde345da52ac7569d04':
  [Fingerprint] Change message in encryption
2015-07-21 00:33:14 +00:00
Maurice Lam
ac4b7fac6b am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit 'af57ec8831d3047400a6bcbc8c5e73fc3888b7d3':
  [ScreenLock] Change title for RedactionInterstitial
2015-07-21 00:33:13 +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
Sungmin Choi
fab7c109b7 Fix bug to force to close once change Bearer on APN
Bug: 22544257
Change-Id: I43eea4034c3d106b8e3f8e4f999f389db04b7567
2015-07-20 17:09:42 -07: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
Maurice Lam
5304965bc8 [ScreenLock] Update illustration during setup wizard
Update the illustration to a new version which changes the "screen"
illustrated in the device.

Bug: 22587892
Change-Id: Ic52e28eb40b965b49fa4f2f220284cd2768470d5
2015-07-20 16:40:51 -07:00
Jim Miller
d55152afce am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit '3977df037c1cdd1bef92e3f4195c6e7b847a1c28':
  Don't launch ConfirmDeviceCredentials multiple times.
2015-07-20 23:05:05 +00:00
Geoff Mendal
bc8c791428 am 1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit '1992d5a1fc616f5132315ee6d4659c20728acad6':
  Import translations. DO NOT MERGE
2015-07-20 22:55:16 +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
9e95d6ce9f am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
* commit '4dd637a07e7eba9341d85c21fbb1fccac7e685c3':
  Fix ugly text wrapping on non-english locales
2015-07-20 20:45:36 +00:00
Jason Monk
cb4b45cc30 am 178c4099: Merge "Handle monkey crash" into mnc-dev
* commit '178c40998df2d5196bc5913fca831880cfa47c50':
  Handle monkey crash
2015-07-20 20:45:33 +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
55073e0954 am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
* commit 'b852fcbde9f5e0d92f5fc2ac8fc088eb114e3b63':
  Offer 'ask' as an available app-linking state
2015-07-20 17:25:17 +00: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
7120c7b6e6 am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
* commit 'bf9a425d5c3f61f02133084d11ab8481b0f53102':
  Simplify FingerprintSettings
2015-07-17 21:15:56 +00: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
75b901c336 am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
* commit '0c03b50a02007499208603733e597f72aa9a59c2':
  Remove blank switchtext from switch preferences.
2015-07-17 20:25:56 +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
262b64e7a9 am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
* commit '90a8a01b629694d28dd7e40a8f0253894fc14e02':
  Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
2015-07-17 18:39:18 +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
feb343ad74 am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
* commit 'ddaa142a094a404d7c5e6d7eea93920f8ed16696':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
2015-07-16 23:49:07 +00:00