PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,107 Commits 1 Branch 0 Tags
a41521465e88a2c29d6e41b735ed4593c3531c8c
Commit Graph

22107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
5eca3ca517 am 52c37bef: (-s ours) am a6e9efbe: (-s ours) am 4a0662dd: (-s ours) Import translations. DO NOT MERGE 
* commit '52c37befda5331cff8e618bdd7d5a63e4e32047e':
  Import translations. DO NOT MERGE
 2015-07-20 23:26:17 +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
Geoff Mendal
88c6a310db am e4af992f: (-s ours) am a74f78b1: (-s ours) am 1992d5a1: (-s ours) Import translations. DO NOT MERGE 
* commit 'e4af992fef82ab26670db5adc7957b4385baa86c':
  Import translations. DO NOT MERGE
 2015-07-20 23:06:47 +00:00
Geoff Mendal
52c37befda am a6e9efbe: (-s ours) am 4a0662dd: (-s ours) Import translations. DO NOT MERGE 
* commit 'a6e9efbeb3bd83db0ad5d45a2bafb306935e02dd':
  Import translations. DO NOT MERGE
 2015-07-20 23:06:46 +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
0968056bac am f5ac0b6a: am f9b46965: am 75842ffc: am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev 
* commit 'f5ac0b6a10b61287789dee0a7a05bf9e6a90a7b6':
  Fix ugly text wrapping on non-english locales
 2015-07-20 21:38:08 +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
Makoto Onuki
f5ac0b6a10 am f9b46965: am 75842ffc: am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev 
* commit 'f9b46965b7c3e2fb7985669f3a2b1bdeed06a2c3':
  Fix ugly text wrapping on non-english locales
 2015-07-20 21:23:38 +00:00
Jason Monk
8e350e8034 am b48e56c9: am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev 
* commit 'b48e56c9b232710c2de0fa852d7230e9b0a191d7':
  Handle monkey crash
 2015-07-20 21:23:37 +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
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
ef1961c732 am 7cce6d0c: am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev 
* commit '7cce6d0c529bf9d3820b1fc4d8b5ad364a74a478':
  Offer 'ask' as an available app-linking state
 2015-07-20 17:59:35 +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
387bc74546 am 644a7e9e: (-s ours) am e9c77337: (-s ours) am 9c314f05: (-s ours) Import translations. DO NOT MERGE 
* commit '644a7e9e1b9f91583074fa54aade99903ff17cec':
  Import translations. DO NOT MERGE
 2015-07-20 15:11:36 +00:00
Geoff Mendal
644a7e9e1b am e9c77337: (-s ours) am 9c314f05: (-s ours) Import translations. DO NOT MERGE 
* commit 'e9c773371d45640868978cc7722295c228b9089e':
  Import translations. DO NOT MERGE
 2015-07-20 15:00:21 +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
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
af5de85bc0 am 64117fef: am 4b3bc882: am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev 
* commit '64117fef33b0e73690a6cddf38992ea5b82d10db':
  Simplify FingerprintSettings
 2015-07-17 21:42:07 +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
4b3bc882ad am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev 
* commit 'bf9a425d5c3f61f02133084d11ab8481b0f53102':
  Simplify FingerprintSettings
 2015-07-17 21:15:57 +00:00
Julia Reynolds
406b1b9f20 am 98f81284: am 03b1b4f3: am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev 
* commit '98f8128486d44defdd6cbda3346baceb6dc1c5f1':
  Remove blank switchtext from switch preferences.
 2015-07-17 21:07:35 +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
98f8128486 am 03b1b4f3: am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev 
* commit '03b1b4f33f9101d95f0e881ffebec24a99498eb0':
  Remove blank switchtext from switch preferences.
 2015-07-17 20:53:54 +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
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
28f352483e am e5a95396: am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev 
* commit 'e5a95396da082a3ba432c5d8ed5a7baa2eacd55c':
  Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
 2015-07-17 19:09:06 +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