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

7498 Commits

Author SHA1 Message Date
Jason Monk
838c843217 Merge "Remove tuner from development settings" into mnc-dev 2015-07-22 19:29:59 +00:00
Maurice Lam
9e1429a54b Merge "[Fingerprint] Add strings for fingerprint during SUW" 2015-07-22 18:27:43 +00:00
Maurice Lam
760c4f1b5d [Fingerprint] Add strings for fingerprint during SUW 
Bug: 22630959
Change-Id: I81aeb498f11bd27d56983776fd36fdbf38f25883
 2015-07-22 11:21:31 -07:00
Geoff Mendal
0a167c400a Import translations. DO NOT MERGE 
Change-Id: Iee7522d01901078d3a091eb4a6e9175e664e99e2
Auto-generated-cl: translation import
 2015-07-22 06:59:04 -07:00
Geoff Mendal
9c17fab30f Import translations. DO NOT MERGE 
Change-Id: I06e1210f46fc7a5e9e822b4bb4d11f7531c2c5eb
Auto-generated-cl: translation import
 2015-07-22 06:11:39 -07:00
Maurice Lam
32b96646ee Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 2015-07-21 23:40:02 +00:00
Maurice Lam
e44ceed122 Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev 2015-07-21 23:38:34 +00: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
f7011298ed am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 
* commit 'bc3695c231a5a16f45059e0e561a35d49353afc5':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
 2015-07-21 18:21:45 +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
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
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
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
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
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
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
Makoto Onuki
b2121d9bdd am 0968056b: am f5ac0b6a: am f9b46965: am 75842ffc: am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev 
* commit '0968056bac9c4eb808792eb6ae0b387899924b89':
  Fix ugly text wrapping on non-english locales
 2015-07-21 00:14: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
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
Geoff Mendal
1992d5a1fc Import translations. DO NOT MERGE 
Change-Id: I1a4e18120641388458b5f90a531978292f307bc6
Auto-generated-cl: translation import
 2015-07-20 15:33:59 -07:00
Geoff Mendal
c9541e5fda Import translations. DO NOT MERGE 
Change-Id: Iee81fc4d17f748e4a9fd294c6d813a773dc44b89
Auto-generated-cl: translation import
 2015-07-20 15:26:26 -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
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
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