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

6772 Commits

Author SHA1 Message Date
John Spurlock
12680fafb7 am e926cd5c: am 196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev 
* commit 'e926cd5cc4ef8d4ef858bc6c7d68e12f32aabac6':
  Settings: Display 'Calls' category on non-voice devices.
 2014-10-21 16:32:29 +00:00
John Spurlock
e926cd5cc4 am 196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev 
* commit '196aacebf9ac9dd4ffedc3012f59285be499e470':
  Settings: Display 'Calls' category on non-voice devices.
 2014-10-21 16:19:46 +00:00
John Spurlock
196aacebf9 Merge "Settings: Display 'Calls' category on non-voice devices." into lmp-mr1-dev 2014-10-21 16:11:12 +00:00
Geoff Mendal
a89b2721ef Merge "Import translations. DO NOT MERGE" 2014-10-21 00:12:05 +00:00
Geoff Mendal
beb94136c9 Import translations. DO NOT MERGE 
Change-Id: I79fe11cf58d0f4e4d7a4de65db5ef8de75742faa
Auto-generated-cl: translation import
 2014-10-20 17:09:23 -07:00
Geoff Mendal
eda5136ba2 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-20 23:57:55 +00:00
Geoff Mendal
d335d4f395 Import translations. DO NOT MERGE 
Change-Id: Ib689764b81b797eb3dee6a1bd786ef911926adbd
Auto-generated-cl: translation import
 2014-10-20 16:52:16 -07:00
Geoff Mendal
c25c92cccd Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-20 23:45:44 +00:00
Geoff Mendal
ac9623c69a Import translations. DO NOT MERGE 
Change-Id: Iffd7117e48c6f0fb2120b254bc455b22c8941ae8
Auto-generated-cl: translation import
 2014-10-20 16:44:24 -07:00
Geoff Mendal
50d4d2d39a Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-20 23:42:30 +00:00
Geoff Mendal
0019c6af93 Import translations. DO NOT MERGE 
Change-Id: I4bcf84faf0b26292a74ed9c833a2e9e48ad795b8
Auto-generated-cl: translation import
 2014-10-20 16:40:41 -07:00
Sanket Padawe
5e5e55c9f0 am 8299d519: am 4bcd973d: am fbde7619: am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 
* commit '8299d519de97ca081ea8ab0cdd3256aae48c8f43':
  Changing settings UI changes related to strings to be displayed
 2014-10-20 21:09:07 +00:00
Sanket Padawe
8299d519de am 4bcd973d: am fbde7619: am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 
* commit '4bcd973db125d775b88d28e5a3c77ba739cf3d9d':
  Changing settings UI changes related to strings to be displayed
 2014-10-20 21:01:53 +00:00
Sanket Padawe
4bcd973db1 am fbde7619: am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 
* commit 'fbde761930f23efd4102c983b430c35a615b71d9':
  Changing settings UI changes related to strings to be displayed
 2014-10-20 20:56:27 +00:00
Sanket Padawe
fbde761930 am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 
* commit 'bdedbb851699016a70eafdb82b038240646358c8':
  Changing settings UI changes related to strings to be displayed
 2014-10-20 20:51:07 +00:00
Sanket Padawe
bdedbb8516 Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 2014-10-20 20:42:57 +00:00
Sanket Padawe
9d276ca597 Changing settings UI changes related to strings to be displayed 
Change-Id: I4e722d7cac3914ce93ad28c806787851949028bd
 2014-10-20 12:33:50 -07:00
John Spurlock
9a940cbf04 Settings: Display 'Calls' category on non-voice devices. 
Since the category applies to any call, include config for
this interruption even on non-voice-capable devices.

Bug: 17666139
Change-Id: I3732246179c527220f8c6bee539ba7bc1e80de18
 2014-10-20 14:22:38 -04:00
Jim Miller
225fc3a83d am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial automerge: c8b2003 
automerge: 8baf923

* commit '8baf92359b0661b067de85e73d275f0421fc768a':
  Fix bad string in EncryptionInterstitial
 2014-10-18 03:32:10 +00:00
Jim Miller
8baf92359b am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial 
automerge: c8b2003

* commit 'c8b20033de1af626d68ca049077e327e839fbb5b':
  Fix bad string in EncryptionInterstitial
 2014-10-18 03:06:26 +00:00
Jim Miller
c8b20033de am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial 
* commit '3d3c870374584d542e7722da44a1b5e3cbffa401':
  Fix bad string in EncryptionInterstitial
 2014-10-18 02:35:43 +00:00
Jim Miller
3d3c870374 am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial 
* commit '456b866c09f88d4fd15c9650d2ee882be9dca8ec':
  Fix bad string in EncryptionInterstitial
 2014-10-18 02:20:59 +00:00
Jim Miller
cd8971a9e9 am aa037675: Fix bad string in EncryptionInterstitial 
* commit 'aa0376759873893197a0109025fd4ec8beca5929':
  Fix bad string in EncryptionInterstitial
 2014-10-18 02:11:05 +00:00
Jim Miller
456b866c09 am aa037675: Fix bad string in EncryptionInterstitial 
* commit 'aa0376759873893197a0109025fd4ec8beca5929':
  Fix bad string in EncryptionInterstitial
 2014-10-18 02:09:26 +00:00
Jim Miller
aa03767598 Fix bad string in EncryptionInterstitial 
The string contains "Talkback", but it should grab one of
the installed Accessibility services so it works on 3rd party
devices.

Fixes bug 17881324

Change-Id: Iee2d8d4ce93c851badc59b5ef21462213f530a96
 2014-10-17 18:28:52 -07:00
Fabrice Di Meglio
01f144f70a am 065c5906: am 6e7216ab: am 140b46e4: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 
* commit '065c5906bdbe19e775d2aca1df8dc82567390db3':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
 2014-10-17 21:46:49 +00:00
Fabrice Di Meglio
065c5906bd am 6e7216ab: am 140b46e4: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 
* commit '6e7216ab78c1210747b49f68bd31a130d2565078':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
 2014-10-17 21:42:00 +00:00
Fabrice Di Meglio
6e7216ab78 am 140b46e4: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 
* commit '140b46e43ca70e2ef13d8a3840cde20b16adba45':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
 2014-10-17 21:36:55 +00:00
Fabrice Di Meglio
140b46e43c Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 2014-10-17 21:32:34 +00:00
Amith Yamasani
4c9adf36f8 am d8bdc10c: am 8a9a55ac: am 8536d6cf: am 06a314d6: am e52c159c: Fix some strings for the encryption stuff. 
* commit 'd8bdc10c721fdd6a4568d285ea6b506c6ea3a6a0':
  Fix some strings for the encryption stuff.
 2014-10-17 21:28:52 +00:00
Fabrice Di Meglio
213a790bf7 am 693046d5: am b3c1c095: am 5c467bc6: Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statistics" into lmp-mr1-dev 
* commit '693046d578b8719287a459c03aecf7950d5ef6dd':
  Fix bug #18024258 Crash in Settings observed after tap on Usage statistics
 2014-10-17 21:28:51 +00:00
Fabrice Di Meglio
71b2c07877 am dd6c3cc2: am dd89d6d5: am 27c0b548: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 
* commit 'dd6c3cc2b453ae6b642d08340daf68a02c55ee87':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
 2014-10-17 21:28:50 +00:00
Jim Miller
84bef7fc46 am 40fbd26a: am ae2ee1dd: am 0303bb20: am c7ccba68: am 4f903c3e: Add strings for upcoming change. 
* commit '40fbd26a40a85a7f820ef58d4cc3c3d648e23ae6':
  Add strings for upcoming change.
 2014-10-17 21:28:42 +00:00
Svetoslav
e90cde72ca am 8cfd94de: am dfa12ed4: am b363c26e: am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption. 
* commit '8cfd94de1dcbe707f3747cc9515e4c3562f6b092':
  User to confirm credentials if an accessibility service changes encryption.
 2014-10-17 21:28:41 +00:00
Amith Yamasani
d8bdc10c72 am 8a9a55ac: am 8536d6cf: am 06a314d6: am e52c159c: Fix some strings for the encryption stuff. 
* commit '8a9a55acae4d74b593bb48777203270d60740932':
  Fix some strings for the encryption stuff.
 2014-10-17 21:17:20 +00:00
Amith Yamasani
8a9a55acae am 8536d6cf: am 06a314d6: am e52c159c: Fix some strings for the encryption stuff. 
* commit '8536d6cfe9952415a2186011b6cebfb7d2c0ee91':
  Fix some strings for the encryption stuff.
 2014-10-17 21:13:23 +00:00
Amith Yamasani
8536d6cfe9 am 06a314d6: am e52c159c: Fix some strings for the encryption stuff. 
* commit '06a314d65ad1583e76394d6c5846e3bbfd8eedcb':
  Fix some strings for the encryption stuff.
 2014-10-17 21:08:11 +00:00
Fabrice Di Meglio
44db45ac11 Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch 
Per UX request, convert Trusted Credentials CheckBoxes to Switches

Change-Id: If878e8c10454a212ba9052280e3cbb17c0fdeeca
 2014-10-17 14:06:22 -07:00
Fabrice Di Meglio
693046d578 am b3c1c095: am 5c467bc6: Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statistics" into lmp-mr1-dev 
* commit 'b3c1c0952800abdc9d37ebaa0c9bca18d345fc77':
  Fix bug #18024258 Crash in Settings observed after tap on Usage statistics
 2014-10-17 21:06:04 +00:00
Amith Yamasani
2ae9f8aba6 am e52c159c: Fix some strings for the encryption stuff. 
* commit 'e52c159cd9b34222ca0440e824d729a9428cbfe6':
  Fix some strings for the encryption stuff.
 2014-10-17 21:02:51 +00:00
Amith Yamasani
06a314d65a am e52c159c: Fix some strings for the encryption stuff. 
* commit 'e52c159cd9b34222ca0440e824d729a9428cbfe6':
  Fix some strings for the encryption stuff.
 2014-10-17 21:02:34 +00:00
Fabrice Di Meglio
b3c1c09528 am 5c467bc6: Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statistics" into lmp-mr1-dev 
* commit '5c467bc615e1a7553d05c361cd7fd7ac8cc4c0cb':
  Fix bug #18024258 Crash in Settings observed after tap on Usage statistics
 2014-10-17 21:00:51 +00:00
Fabrice Di Meglio
dd6c3cc2b4 am dd89d6d5: am 27c0b548: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 
* commit 'dd89d6d570272612e21719321ea4042f09bc5427':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
 2014-10-17 20:58:14 +00:00
Fabrice Di Meglio
dd89d6d570 am 27c0b548: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 
* commit '27c0b548ab701aefef7655e78401a52c33c6270c':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
 2014-10-17 20:53:16 +00:00
Fabrice Di Meglio
5c467bc615 Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statistics" into lmp-mr1-dev 2014-10-17 20:52:56 +00:00
Fabrice Di Meglio
27c0b548ab Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 2014-10-17 20:46:32 +00:00
Amith Yamasani
e52c159cd9 Fix some strings for the encryption stuff. 
Bug: 17881324
Change-Id: I2bee6773d3ce8f5bede92ded3d2d937bf0e8685c
 2014-10-17 13:42:14 -07:00
Jim Miller
40fbd26a40 am ae2ee1dd: am 0303bb20: am c7ccba68: am 4f903c3e: Add strings for upcoming change. 
* commit 'ae2ee1dd0537cb92d3df4568bc0cd82ef4663ad0':
  Add strings for upcoming change.
 2014-10-17 20:28:56 +00:00
Svetoslav
8cfd94de1d am dfa12ed4: am b363c26e: am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption. 
* commit 'dfa12ed48476968b919e20770493cfb89985be54':
  User to confirm credentials if an accessibility service changes encryption.
 2014-10-17 20:28:30 +00:00
Jim Miller
ae2ee1dd05 am 0303bb20: am c7ccba68: am 4f903c3e: Add strings for upcoming change. 
* commit '0303bb203059e75c729804405d481bd3333c4098':
  Add strings for upcoming change.
 2014-10-17 20:02:22 +00:00