PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,791 Commits 1 Branch 0 Tags
c5459430a08351544e6545a16aa07147b186ec7b
Commit Graph

20791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
480692fab3 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:09:12 +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
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
d409b70093 am f516e7dd: Make \'fingerprint\' searchable in Settings. 
* commit 'f516e7dde0074416dbf51650cbfb9cc763027b27':
  Make 'fingerprint' searchable in Settings.
 2015-07-21 15:31:17 +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
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
d5af0d8b8a am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev 
* commit 'd85fafce30f6fb71ea9de9de3c6d8aafc99dba33':
  [ScreenLock] Change title of encryption interstitial
 2015-07-21 00:49:46 +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
6132fe1c02 am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev 
* commit 'd10026cbfde671448b702fde345da52ac7569d04':
  [Fingerprint] Change message in encryption
 2015-07-21 00:33:23 +00:00
Maurice Lam
8ebd1e2c06 am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev 
* commit 'af57ec8831d3047400a6bcbc8c5e73fc3888b7d3':
  [ScreenLock] Change title for RedactionInterstitial
 2015-07-21 00:33:22 +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
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
d74a36031c 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:51 +00:00
Geoff Mendal
e4af992fef am a74f78b1: (-s ours) am 1992d5a1: (-s ours) Import translations. DO NOT MERGE 
* commit 'a74f78b188d11b0dfd7651aff77b2db4eae0278e':
  Import translations. DO NOT MERGE
 2015-07-20 22:57:40 +00:00
Geoff Mendal
a6e9efbeb3 am 4a0662dd: (-s ours) Import translations. DO NOT MERGE 
* commit '4a0662dddeeea4fa9a62a97b5dd9e996860db7cd':
  Import translations. DO NOT MERGE
 2015-07-20 22:57:38 +00:00
Geoff Mendal
a74f78b188 am 1992d5a1: (-s ours) Import translations. DO NOT MERGE 
* commit '1992d5a1fc616f5132315ee6d4659c20728acad6':
  Import translations. DO NOT MERGE
 2015-07-20 22:52:48 +00:00
Jim Miller
3977df037c Merge "Don't launch ConfirmDeviceCredentials multiple times." into mnc-dev 2015-07-20 22:50:30 +00:00
Geoff Mendal
4a0662ddde Import translations. DO NOT MERGE 
Change-Id: Ief6e249d326487904a789fa2b33e6d775b7b2bd7
Auto-generated-cl: translation import
 2015-07-20 15:41:29 -07: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
f9b46965b7 am 75842ffc: am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev 
* commit '75842ffc9a8a41425b69e1e1ad77ffde14ed4749':
  Fix ugly text wrapping on non-english locales
 2015-07-20 21:08:05 +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
Makoto Onuki
75842ffc9a 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:46:02 +00:00
Jason Monk
959a7380f1 am 178c4099: Merge "Handle monkey crash" into mnc-dev 
* commit '178c40998df2d5196bc5913fca831880cfa47c50':
  Handle monkey crash
 2015-07-20 20:46:01 +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
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
f330857a17 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:24:02 +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
Geoff Mendal
e9c773371d am 9c314f05: (-s ours) Import translations. DO NOT MERGE 
* commit '9c314f05f85ffe6918bcd9d0747903dc6786dfc0':
  Import translations. DO NOT MERGE
 2015-07-20 14:45:23 +00:00
Geoff Mendal
9c314f05f8 Import translations. DO NOT MERGE 
Change-Id: Ibd37f1c6a32c600eaf7b410891ba81814589ea04
Auto-generated-cl: translation import
 2015-07-20 07:01:44 -07: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
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
4b3bc882ad am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev 
* commit 'bf9a425d5c3f61f02133084d11ab8481b0f53102':
  Simplify FingerprintSettings
 2015-07-17 21:15:57 +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
03b1b4f33f am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev 
* commit '8560ae2f8752f611ffee651289519a7993b3e500':
  Remove blank switchtext from switch preferences.
 2015-07-17 20:40:19 +00:00
Julia Reynolds
8560ae2f87 am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev 
* commit '0c03b50a02007499208603733e597f72aa9a59c2':
  Remove blank switchtext from switch preferences.
 2015-07-17 20:27:24 +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
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
e104fced18 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:23 +00:00