Commit Graph

9701 Commits

Author SHA1 Message Date
Yasuhiro Matsuda
4a109b1d87 Handle the case where USB_STATE intent is not received yet.
Call updateUsbConfigurationValues() when ACTION_USB_STATE intent
is not yet received so that mUsbConfiguration value is properly
initialized in this case.

BUG: 22163689
Change-Id: I2aeed43fc49e40c52cdc2bfc08d43081815b49d1
2015-07-22 23:20:05 +09:00
Jason Monk
82f30d2a41 Fix battery detail issues with "Android OS"
Bug: 22638215
Change-Id: Ia5bab7eb3bfb964e7f914e8c8f392f4fea66eb29
2015-07-22 10:12:05 -04: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
Jorim Jaggi
f5b17e5588 Move PIN/Pattern appear animation to RenderThread (2/2)
Bug: 22205322
Change-Id: Idd16de04701c330b7559bb403316f691a9a717e9
2015-07-21 15:34:26 -07: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
2e407c317a am 90bc96f8: am f7011298: am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit '90bc96f83dcfe84e697b8a8370488442665ce9e2':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
2015-07-21 18:51:31 +00:00
Billy Lau
90bc96f83d am f7011298: am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit 'f7011298eda26b6972a36a9735182fa6afd35093':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
2015-07-21 18:36:48 +00:00
Billy Lau
bc3695c231 am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit 'e267fb3119754f205bf8518a6c00d3e957b0e45f':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
2015-07-21 18:06:42 +00:00
Amit Mahajan
dd871497f0 am e6e41f45: am a38dfb03: am c5459430: am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit 'e6e41f453d608b443be315f5e1a223054bfd2b68':
  Fix bug to force to close once change Bearer on APN
2015-07-21 17:58:22 +00:00
Amit Mahajan
e6e41f453d am a38dfb03: am c5459430: am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit 'a38dfb03c4054dbe08ffab01b8d42329e91fd639':
  Fix bug to force to close once change Bearer on APN
2015-07-21 17:44:46 +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
c5459430a0 am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit '480692fab398a080be6648ddf424b3129f2c6cbc':
  Fix bug to force to close once change Bearer on APN
2015-07-21 17:17:45 +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
dd8f30541c am 08b94d5b: am 3d94772b: am 6712be4a: am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '08b94d5b067fb68ba049aa611853bf102a4495d2':
  Make 'fingerprint' searchable in Settings.
2015-07-21 16:23:52 +00:00
Julia Reynolds
08b94d5b06 am 3d94772b: am 6712be4a: am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '3d94772b082ff9e359e6ad9ebe2ea48292421966':
  Make 'fingerprint' searchable in Settings.
2015-07-21 16:10:31 +00:00
Julia Reynolds
6712be4a70 am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit 'd409b70093211df215bc117ccf9ba8d0924e983f':
  Make 'fingerprint' searchable in Settings.
2015-07-21 15:44:21 +00:00
Julia Reynolds
f516e7dde0 Make 'fingerprint' searchable in Settings.
Bug: 22511754
Change-Id: I1e145ca9a33eb336014a8a4e158e9196a91cfdcc
2015-07-21 14:28:40 +00:00
Jason Monk
94f9c824c4 Don't show disabled apps in ignore optimizations
Bug: 22612760
Change-Id: Iddb3ad9cb9403d9e51bfcda82db3d10ee34ca47d
2015-07-21 09:30:18 -04:00
Daichi Hirono
35197218fc Merge "Turn the eject menu into a button." 2015-07-21 06:14:37 +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
fed7de4546 am d0577460: am 3234f0b9: am c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit 'd05774600e5ac86cb883041abfb5b407afa04fd3':
  [ScreenLock] Change title of encryption interstitial
2015-07-21 01:47:32 +00:00
Maurice Lam
a5d2be8683 am 6e512e08: am b8c09951: am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit '6e512e0815c8678621077008498f18e73402ecc3':
  [Fingerprint] Change message in encryption
2015-07-21 01:37:07 +00:00
Maurice Lam
9a93dfa8cb am d7615bba: am ec2f7fe5: am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit 'd7615bbaacf6c7dc4ae91e0921cfb2f5987c73bc':
  [ScreenLock] Change title for RedactionInterstitial
2015-07-21 01:37:06 +00:00
Maurice Lam
d05774600e am 3234f0b9: am c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit '3234f0b9bdbe32658d1ebe33e278cfb5185a785b':
  [ScreenLock] Change title of encryption interstitial
2015-07-21 01:35:01 +00:00
Maurice Lam
6e512e0815 am b8c09951: am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit 'b8c099519bfc93777de19095c9aa6030ca51b6cc':
  [Fingerprint] Change message in encryption
2015-07-21 01:18:51 +00:00
Maurice Lam
d7615bbaac am ec2f7fe5: am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit 'ec2f7fe57d7a210f226ddcb622e01cf4c45b25b2':
  [ScreenLock] Change title for RedactionInterstitial
2015-07-21 01:18:49 +00:00
Maurice Lam
c690d199be am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit 'd5af0d8b8a973a2f82024f5358572b609e47a758':
  [ScreenLock] Change title of encryption interstitial
2015-07-21 01:04:47 +00:00
Maurice Lam
e82793a2de am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit '6132fe1c02a944bf87604a4773e091124de4954d':
  [Fingerprint] Change message in encryption
2015-07-21 00:49:50 +00:00
Maurice Lam
135c8869fe am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit '8ebd1e2c06d8526dd8a3081d743bc77ee565fc10':
  [ScreenLock] Change title for RedactionInterstitial
2015-07-21 00:49:49 +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
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
Jim Miller
9e81045a95 am 717f4879: am b858853d: am a8f88798: am d74a3603: am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit '717f487964b2e0029119b591f7f241e3262f7006':
  Don't launch ConfirmDeviceCredentials multiple times.
2015-07-21 00:16:03 +00:00
Jason Monk
c2f431debe am 97c68c18: am 8e350e80: am b48e56c9: am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev
* commit '97c68c181dba345139e6ae98cdc4128b1744e1a0':
  Handle monkey crash
2015-07-21 00:14:01 +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
Jim Miller
717f487964 am b858853d: am a8f88798: am d74a3603: am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit 'b858853dc395498acc75422e568d7156062c4f9c':
  Don't launch ConfirmDeviceCredentials multiple times.
2015-07-20 23:38:06 +00:00
Jim Miller
a8f8879895 am d74a3603: am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit 'd74a36031cbe87a8a18f4ffc99aaa399245f181c':
  Don't launch ConfirmDeviceCredentials multiple times.
2015-07-20 23:20:15 +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
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
Jason Monk
97c68c181d am 8e350e80: am b48e56c9: am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev
* commit '8e350e80343dbfd8aafce275a25fff7124f3e9ce':
  Handle monkey crash
2015-07-20 21:38:07 +00:00
Jason Monk
b48e56c9b2 am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev
* commit '959a7380f15ea95ccba6d7d6ae30fee8f312bb84':
  Handle monkey crash
2015-07-20 21:08:04 +00:00
Jason Monk
178c40998d Merge "Handle monkey crash" into mnc-dev 2015-07-20 20:32:29 +00:00
Christopher Tate
d2dcd30acd am 99e89859: am ef1961c7: am 7cce6d0c: am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
* commit '99e8985959682c510e7e2fac210768e2471b4b26':
  Offer 'ask' as an available app-linking state
2015-07-20 18:38:23 +00:00
Christopher Tate
99e8985959 am ef1961c7: am 7cce6d0c: am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
* commit 'ef1961c7326aa60e1e3bbb738394c535b7f952af':
  Offer 'ask' as an available app-linking state
2015-07-20 18:17:05 +00:00
Christopher Tate
7cce6d0c52 am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
* commit 'f330857a17d29cec33ca0169cb30fdc69854ab52':
  Offer 'ask' as an available app-linking state
2015-07-20 17:41:08 +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