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
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
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
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
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
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
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
03bb45e110
am af5de85b: am 64117fef: am 4b3bc882: am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
...
* commit 'af5de85bc0797449005c028e21a8af7a3c460901':
Simplify FingerprintSettings
2015-07-17 21:49:34 +00:00
Jim Miller
64117fef33
am 4b3bc882: am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
...
* commit '4b3bc882ad2824a1f7d4362d8757ddb9c7ba21ce':
Simplify FingerprintSettings
2015-07-17 21:30:11 +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
Billy Lau
81e050aad0
am 28f35248: am e5a95396: am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
...
* commit '28f352483e2951339627be1867562cd4ca99f66e':
Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
2015-07-17 19:29:21 +00:00
Billy Lau
e5a95396da
am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
...
* commit 'e104fced18056905286ee01a3ef8c3d12f2b9e4d':
Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
2015-07-17 18:57:51 +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
0111096eca
am 5c3f34b7: am b42eb5e2: am 649cc87f: am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
...
* commit '5c3f34b7e5ce05d134e7ec907758641a8bdf1932':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
2015-07-17 00:27:45 +00:00
Christopher Tate
b42eb5e221
am 649cc87f: am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
...
* commit '649cc87f994c0010e8fd7567b7cece77ffffb0fd':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
2015-07-17 00:04:04 +00: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
Kenny Guy
32b5ec834a
am dbb975f8: am 00a82a4e: am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev
...
* commit 'dbb975f8a0dc77bbfa9578a3a394de9cbe08d7cd':
Show disabled trust agents as off.
2015-07-16 13:42:00 +00:00
Kenny Guy
00a82a4e1b
am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev
...
* commit '29d1b0d0f4e7760ee1ed317b303a6c4ec54adda7':
Show disabled trust agents as off.
2015-07-16 13:15:57 +00:00
Kenny Guy
705faddbb3
Merge "Show disabled trust agents as off." into mnc-dev
2015-07-16 12:42:41 +00:00
Sanket Padawe
45c5de2f62
am e07fce2c: am 18c31082: am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
...
* commit 'e07fce2c3bde8c8fd5c380a0a524378d0d99e092':
Use common xml file for multi-tab settings.
2015-07-16 05:48:44 +00:00
Sanket Padawe
18c31082b3
am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
...
* commit 'c5be2243d79ea0a27a7c61ee3aeffdacd7f63b06':
Use common xml file for multi-tab settings.
2015-07-16 05:27:44 +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
Jason Monk
6d2be9f204
am a4dfe05b: am 543d68cc: am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
...
* commit 'a4dfe05b29118055f9e8d4437655e2354cfb1dd7':
Disable ignore battery optimization items that can't change
2015-07-15 23:48:21 +00:00
Jason Monk
bfa8e5d53b
am 5d780aa9: am f9d8deff: am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit '5d780aa92175ae9d3b1204d67d0c23e943041d8e':
Change move storage from dropdown pref to dialog
2015-07-15 23:48:20 +00:00
Jason Monk
543d68cc3a
am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
...
* commit '194e92d3a0dcc15056fac17690f2f36bdc96861a':
Disable ignore battery optimization items that can't change
2015-07-15 23:20:43 +00:00
