PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,392 Commits 1 Branch 0 Tags
13a070549d7a38e6b892293eb1ec4f6e52eff2cc
Commit Graph

21392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
3234f0b9bd am c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev 
* commit 'c690d199be82337f3909348443391bbad081d37f':
  [ScreenLock] Change title of encryption interstitial
 2015-07-21 01:19:47 +00:00
Maurice Lam
b8c099519b am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev 
* commit 'e82793a2de48be5334f3892d96e1e2736a3064c0':
  [Fingerprint] Change message in encryption
 2015-07-21 01:04:50 +00:00
Maurice Lam
ec2f7fe57d am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev 
* commit '135c8869fe4cc2cad8df07172c2f225da23ef07e':
  [ScreenLock] Change title for RedactionInterstitial
 2015-07-21 01:04: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
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
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
b858853dc3 am a8f88798: am d74a3603: am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev 
* commit 'a8f8879895edd86fd206fc1a8d2d684e09fcc57f':
  Don't launch ConfirmDeviceCredentials multiple times.
 2015-07-20 23:28:14 +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
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
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
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
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