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

2890 Commits

Author SHA1 Message Date
Sanket Padawe
8942c62165 Change for setting transparency of sim colors. 
Changes for setting transparency of sim colors in sim settings UI.

Change-Id: I5717da94bfb6bb260864a46c3898d347be96d6af
 2014-11-04 18:14:39 -08:00
Paul Crowley
01fbd9fd3c Don't show a pattern-specific prompt at encryption time. 
Bug: 18054895
Change-Id: I8a029142085b9e7f59efc8e313b6438734d5a1bb
 2014-11-05 00:43:33 +00:00
vandwalle
e2ebb88560 am 68421fd5: am e1cb279f: am 508a693c: Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev 
* commit '68421fd5c66d2c14ffddc989ccb2815c4da74352':
  sanitize strings and error messages in wiFi picker
 2014-11-04 20:23:28 +00:00
vandwalle
508a693c9a Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev 2014-11-04 20:07:44 +00:00
vandwalle
b245731e88 sanitize strings and error messages in wiFi picker 
Change-Id: I642e79b40902bb45a503be949dea6a09d94b3bc8
 2014-11-04 12:05:30 -08:00
Andres Morales
48b0b241aa Confirm enabling OEM unlock with warning dialog 
Bug: 18227644
Change-Id: I326a4cf215ef0e30fd8a054964e0efeb3f627d89
 2014-11-04 10:58:19 -08:00
Alexandra Gherghina
7e7e54764e am ab054dc1: am 06ad8ce5: am d47f15a4: Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev 
* commit 'ab054dc138041e5cb77b24aab0f85a40e78eb942':
  Apply predefined icon and label to managed profiles
 2014-11-04 14:03:02 +00:00
Alexandra Gherghina
d47f15a474 Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev 2014-11-04 13:50:52 +00:00
PauloftheWest
ae9b59faa3 am f75a8182: Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev automerge: ba53a84 automerge: e8cf3ee 
* commit 'f75a8182bd64983d3f9ec7208d0224a282af51e0':
  Added cellular data popup in DataUsage
 2014-11-04 01:13:53 +00:00
Andres Morales
73bbd4cbff Request PIN confirmation to enable OEM unlock 
Bug: 18191568
Change-Id: I1cfce5131c96711876953a28d8d642342d15201e
 2014-11-03 17:02:11 -08:00
PauloftheWest
ba53a846b1 Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev 2014-11-03 23:00:19 +00:00
Jason Monk
52f3f76855 am 7833aae7: am d5032cb5: am 8f5c0e46: Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev 
* commit '7833aae7822c2e636c50c3756b894ee86c1072b8':
  Bring screen lock setting back to screen pinning
 2014-11-03 14:55:12 +00:00
Jason Monk
78121d9d10 Bring screen lock setting back to screen pinning 
The material design of the request has removed this option from
the dialog, and now needs to be in settings.  When screen
pinning is off it shows a description of how to use the feature,
however when on it shows a switch to control whether it locks
the device on exit.  This setting defaults to on if there is a
lock pin/pattern.

Bug: 16957435
Change-Id: I59e0d64964cee4302e6ecff59e622cfe11422807
 2014-10-31 15:45:12 -04:00
Alexandra Gherghina
0f5440f6e2 Apply predefined icon and label to managed profiles 
Bug: 18132630
Change-Id: Ie6cfee420847d6992accb0bc0ca3f5535260bc55
 2014-10-31 12:03:53 +00:00
PauloftheWest
de33844d81 Added cellular data popup in DataUsage 
+ If the user attempts to enable data usage on a SIM that is not the
default, the system will confirm that the user wants data to go through
the new SIM.

Change-Id: Ia1652a30a3641bb29eadad20b2dc61321227a961
 2014-10-30 13:56:23 -07:00
Sanket Padawe
197976e6d1 resolve merge conflicts of 4e4a3f8 to master. 
Change-Id: Idab7b34c8c3f4a833686fb104e1869438b2df51d
 2014-10-30 11:05:55 -07:00
Przemyslaw Szczepaniak
abe1ad74a1 Merge "Fix typo in TTS Language option description." 2014-10-30 12:45:54 +00:00
Przemyslaw Szczepaniak
9f153fedd9 Fix typo in TTS Language option description. 
Bug: 18098410
Change-Id: Icf3736cc2f28c240d40d06b33d4f81012314cbb1
 2014-10-30 11:53:26 +00:00
PauloftheWest
9d5a324279 am 109ca52c: am 22f257b0: am 93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev 
* commit '109ca52c67c90d15c98cd3634035d0526f906e5b':
  Added IMEI status activity.
 2014-10-30 11:06:53 +00:00
Sanket Padawe
917aaf9ebd Merge "Add sim color selection in settings" into lmp-mr1-dev 2014-10-28 22:48:33 +00:00
Sanket Padawe
abc505aac3 Add sim color selection in settings 
Adding a dropdown list to select sim color from sim settings UI.

Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
 2014-10-28 14:01:50 -07:00
PauloftheWest
f41aaa249b Added IMEI status activity. 
+ Added IMEI support from MTK with formatting changes.  Now extra SIM
  IMEI information is displayed in a seperate activity.

Bug: 17935115
Change-Id: I48942d77650bef2a1778996db3b1ec3a9d87492c
 2014-10-28 13:00:11 -07:00
Selim Gurun
4920f0fcfd Merge "Enable DRP only through command line." 2014-10-24 16:33:50 +00:00
Selim Gurun
65723ffe12 Enable DRP only through command line. 
Enable DRP only through command line so remove it from dev settings. 

This reverts commit 7818de107a.

Change-Id: I2a3c60d9200b79a876ab69c7c495416a41108c39
 2014-10-24 14:48:30 +00:00
Sanket Padawe
480ce321ea am f7fad6b6: am eee65f04: am 286e3c46: am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 
* commit 'f7fad6b6db1476f1972fc7399bead8937057906a':
  Commit with dialog box but using subinfo records
 2014-10-22 22:40:47 +00:00
Sanket Padawe
286e3c4651 am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 
* commit '266e429657774dc7aa14029629a9e78c942c6104':
  Commit with dialog box but using subinfo records
 2014-10-22 20:45:40 +00:00
John Spurlock
047bbf31e9 am 968a2947: am 5c1f4155: am 2ae90864: Settings: Remove obsolete string: heads_up_enabled_title. 
* commit '968a294720b07c75dde10f371f02808bb5162904':
  Settings: Remove obsolete string: heads_up_enabled_title.
 2014-10-22 18:20:33 +00:00
John Spurlock
2ae908649c Settings: Remove obsolete string: heads_up_enabled_title. 
Instead of bumping the char limit as requested by translation, simply
remove it altogether, it's no longer used.

Bug: 14244562
Change-Id: I20737ec80c748c1a0eb206819ae82348a05c31a9
 2014-10-22 11:36:58 -04:00
Alexandra Gherghina
a160b96005 am b9d05d6c: Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev automerge: 3748b94 
automerge: 3ac497d

* commit '3ac497d8d5ba1f1b9f3e5e4d2b8af8ddc7539025':
  Fix user spinner anchor following system ui changes
 2014-10-22 00:59:20 +00:00
Selim Gurun
146ab4684a Merge "Revert "Remove WebView DRP Setting from Developer Settings"" 2014-10-22 00:07:27 +00:00
Selim Gurun
7818de107a Revert "Remove WebView DRP Setting from Developer Settings" 
This reverts commit 90886b8284.

Conflicts:
	src/com/android/settings/DevelopmentSettings.java

Change-Id: Ib41061bfbd74294ad643173c0caaf5f66bba410e
 2014-10-21 16:56:46 -07:00
Alexandra Gherghina
b9d05d6c63 Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev 2014-10-21 22:20:07 +00:00
Sanket Padawe
a501137f26 Commit with dialog box but using subinfo records 
Change-Id: I144aa8899eb050db29a9d78aaf7af4c1f31d9eab
 2014-10-21 14:16:12 -07:00
John Spurlock
e519a16545 am 12680faf: am e926cd5c: am 196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev 
* commit '12680fafb7bdf67a8cf624e3533321c7df2aa11a':
  Settings: Display 'Calls' category on non-voice devices.
 2014-10-21 16:37:48 +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
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
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
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
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
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
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
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
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
Amith Yamasani
e52c159cd9 Fix some strings for the encryption stuff. 
Bug: 17881324
Change-Id: I2bee6773d3ce8f5bede92ded3d2d937bf0e8685c
 2014-10-17 13:42:14 -07:00