PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,170 Commits 1 Branch 0 Tags
f3cc23524fddcc2d55d17747a901b2090773e429
Commit Graph

7484 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Makoto Onuki
26cf58aba6 Fix ugly text wrapping on non-english locales 
Bug 22284618

Change-Id: Iaab017fa5d2f5aeb3457f911cbd31ceb8671e495
 2015-07-16 15:45:09 -07:00
Jason Monk
b1d9536e58 Remove tuner from development settings 
It has a new home now.

Bug: 22462605
Change-Id: Ibf07a63db14579d07b09d5150b7d04cf138f3b78
 2015-07-16 16:41:15 -04:00
Julia Reynolds
16eec50576 Remove blank switchtext from switch preferences. 
This makes TTS services read the default text (on/off) when
these switches are toggled.

Bug: 22530662
Change-Id: I77c5918481faa6309995aa385dcfc3608fc94298
 2015-07-16 13:28:16 -04: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
e07fce2c3b am 18c31082: am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev 
* commit '18c31082b397858564f1dc99a785dc77d1814151':
  Use common xml file for multi-tab settings.
 2015-07-16 05:40:25 +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
Maurice Lam
1e83db9426 am 037ec868: am 85f199d8: am 021b3d95: am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev 
* commit '037ec86847055f57fa98db71c7b30ae3030ff16d':
  [Fingerprint] Use accent color for fingerprint highlight
 2015-07-16 03:10:26 +00:00
Maurice Lam
037ec86847 am 85f199d8: am 021b3d95: am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev 
* commit '85f199d8620c689ae6f0ae94eeda9168fa93c2db':
  [Fingerprint] Use accent color for fingerprint highlight
 2015-07-16 02:57:00 +00:00
Maurice Lam
85f199d862 am 021b3d95: am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev 
* commit '021b3d955f91eeaa03f8f45401663954560dc748':
  [Fingerprint] Use accent color for fingerprint highlight
 2015-07-16 02:43:11 +00:00
Maurice Lam
bec1d29558 Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev 2015-07-16 02:19:19 +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
a4dfe05b29 am 543d68cc: am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev 
* commit '543d68cc3a68098bface7335266a46d1ae0603ca':
  Disable ignore battery optimization items that can't change
 2015-07-15 23:30:21 +00:00
Jason Monk
5d780aa921 am f9d8deff: am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev 
* commit 'f9d8deffaa79da57f04c9eed50d0d1991daac4b1':
  Change move storage from dropdown pref to dialog
 2015-07-15 23:30:19 +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