PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,657 Commits 1 Branch 0 Tags
2a0affe49917a260e89f16ed0d810daa65d3646c
Commit Graph

10657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
34e85f841c Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-05 18:48:15 +00:00
Baligh Uddin
ce64877469 Import translations. DO NOT MERGE 
Change-Id: I841d6ddb3797a3a84dc53f5139351232e6a6a5da
Auto-generated-cl: translation import
 2013-04-05 11:10:03 -07:00
Baligh Uddin
92be13df55 Import translations. DO NOT MERGE 
Change-Id: Ide4cc0e303747966dd29a5c849a2d9023b92e098
Auto-generated-cl: translation import
 2013-04-05 11:07:06 -07:00
Kristian Monsen
704793f374 am 3c6c45f9: am a95604de: Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev 
* commit '3c6c45f931307af098e790e86b114c804655f42b':
  Adding developer toggle for using Chromium WebView.
 2013-04-05 10:51:22 -07:00
Kristian Monsen
3c6c45f931 am a95604de: Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev 
* commit 'a95604de1acd89999c240449e926485393963455':
  Adding developer toggle for using Chromium WebView.
 2013-04-05 10:46:44 -07:00
Kristian Monsen
a95604de1a Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev 2013-04-05 17:41:34 +00:00
Fabrice Di Meglio
8a34360c25 am 66fe9882: am e68959de: Merge "More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev 
* commit '66fe98823f7b38387034ed3bfc9a90d629a5a980':
  More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode
 2013-04-04 11:06:49 -07:00
Fabrice Di Meglio
66fe98823f am e68959de: Merge "More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev 
* commit 'e68959de3a7f2d47de4816b65262b10e03ef313c':
  More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode
 2013-04-04 11:02:04 -07:00
Fabrice Di Meglio
e68959de3a Merge "More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev 2013-04-04 17:59:50 +00:00
Baligh Uddin
8b7c71ea35 am 63627c20: am 186e250a: Import translations. DO NOT MERGE 
* commit '63627c20bd4bbfb59ba4f3db1bf5948c76fa6038':
  Import translations. DO NOT MERGE
 2013-04-03 15:03:59 -07:00
Baligh Uddin
63627c20bd am 186e250a: Import translations. DO NOT MERGE 
* commit '186e250ac7f74e8c724919184e949f7bf17afefb':
  Import translations. DO NOT MERGE
 2013-04-03 14:59:08 -07:00
Baligh Uddin
29366f48ec Import translations. DO NOT MERGE 
Change-Id: I3eddc5b7fbb017c3e3b4029a7cb93a87c9c11f06
Auto-generated-cl: translation import
 2013-04-03 11:17:55 -07:00
Baligh Uddin
186e250ac7 Import translations. DO NOT MERGE 
Change-Id: I5b8551dbf8daff54103023c68f8214b135dd07c1
Auto-generated-cl: translation import
 2013-04-03 11:14:39 -07:00
Fabrice Di Meglio
f2a9717b93 More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode 
- use setPaddingRelative() instead of setPadding()
- add missing android:textAlignment="viewStart"

Change-Id: I8b981fb64686067de5998e4e218b04126bf2b2f8
 2013-04-02 18:36:43 -07:00
Robert Greenwalt
c41346d5bd am 456eadd9: am 58f9cbd6: Merge "pre-provide the mvno data of the edited apn" into jb-mr2-dev 
* commit '456eadd9feb4b570ba59c6cbbd43013484d31f62':
  pre-provide the mvno data of the edited apn
 2013-04-02 12:29:10 -07:00
Robert Greenwalt
456eadd9fe am 58f9cbd6: Merge "pre-provide the mvno data of the edited apn" into jb-mr2-dev 
* commit '58f9cbd6774741d7fffbddbd06f2c0bf1fdf2e66':
  pre-provide the mvno data of the edited apn
 2013-04-02 12:25:17 -07:00
Robert Greenwalt
58f9cbd677 Merge "pre-provide the mvno data of the edited apn" into jb-mr2-dev 2013-04-02 19:20:13 +00:00
Sungmin Choi
cd1cb16bad pre-provide the mvno data of the edited apn 
For mvno, user can add or edit mvno data field.
Pre-provide the mvno data of the edited apn when the user selects
one of the mvno types.
For example if user choose gid, populate the data field with the
current sim's gid1 data, or if user choose the SPN option, fill
in data with the current carrier string. If IMSI, fill in imsi data.

Change-Id: I1bc280054cc7cd37e78a279866cefd62872a19fb
 2013-04-01 16:44:15 -07:00
Baligh Uddin
ae411c7fac am 0c4da3fa: (-s ours) am 1c541aec: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '0c4da3fa97dc637571d8f0473bc1a1f5bade4fdb':
  Import translations. DO NOT MERGE
 2013-04-01 12:41:42 -07:00
Baligh Uddin
0c4da3fa97 am 1c541aec: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '1c541aec2be937f3ba6b1530551c16435d0eafc6':
  Import translations. DO NOT MERGE
 2013-04-01 12:39:36 -07:00
Baligh Uddin
1c541aec2b Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-01 19:37:24 +00:00
Baligh Uddin
a63f794e3d Merge "Import translations. DO NOT MERGE" 2013-04-01 19:36:05 +00:00
Maggie Benthall
28d53dc9c0 am e427ccdc: am 8d9b07ed: Merge "When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls." into jb-mr2-dev 
* commit 'e427ccdce304a8afe8ebb493d60e94de56acedb3':
  When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls.
 2013-04-01 11:55:05 -07:00
Maggie Benthall
e427ccdce3 am 8d9b07ed: Merge "When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls." into jb-mr2-dev 
* commit '8d9b07edb1785983f60a317a6adbc6199f81788c':
  When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls.
 2013-04-01 11:52:50 -07:00
Maggie Benthall
8d9b07edb1 Merge "When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls." into jb-mr2-dev 2013-04-01 18:50:30 +00:00
Amith Yamasani
606b8aa9ed am 52d9a78f: am cb7b0b77: Better app filtering for limited users 
* commit '52d9a78f2241b62e6fa1ce9e07777d7c8e30af96':
  Better app filtering for limited users
 2013-03-31 22:46:01 -07:00
Amith Yamasani
52d9a78f22 am cb7b0b77: Better app filtering for limited users 
* commit 'cb7b0b77ae04a84c75611a98a583c81208575ba5':
  Better app filtering for limited users
 2013-03-31 22:44:14 -07:00
Amith Yamasani
cb7b0b77ae Better app filtering for limited users 
Show all system apps that have launchers and widgets.
Show all downloaded apps.
Remove dupes by package name.

Change-Id: Ief59b057e55a55e48ef48c5a638f6daf6a952e4e
 2013-03-31 22:40:26 -07:00
Amith Yamasani
5a02cbe2ec am b19daff9: am 2601cd91: Implement proper settings restrictions 
* commit 'b19daff9cb6f04a71343f858a0c44415412b8049':
  Implement proper settings restrictions
 2013-03-31 18:25:07 -07:00
Amith Yamasani
b19daff9cb am 2601cd91: Implement proper settings restrictions 
* commit '2601cd9142bda1953c1e7b0302f7e0d0f02b0c1b':
  Implement proper settings restrictions
 2013-03-31 18:22:50 -07:00
Amith Yamasani
2601cd9142 Implement proper settings restrictions 
Settings restrictions for limited users translate to user
restrictions specified in UserManager. Added required strings.
TODO: Add NFC restriction.

Change-Id: If1f81319131855f5dc1b27fe5bd54a4fef616d7f
 2013-03-31 18:20:36 -07:00
Amith Yamasani
249616ebdb am fe44098d: am 732c80ff: Remove Limited users category if empty 
* commit 'fe44098dd126af1a19fe3e29e35506a07bc05c62':
  Remove Limited users category if empty
 2013-03-29 20:33:07 -07:00
Amith Yamasani
fe44098dd1 am 732c80ff: Remove Limited users category if empty 
* commit '732c80ff18a0e0e0cd516e7ec007eda1574cd2de':
  Remove Limited users category if empty
 2013-03-29 20:31:22 -07:00
Amith Yamasani
732c80ff18 Remove Limited users category if empty 
If there are no users under limited category, in a secondary user,
remove the subheading completely.

Change-Id: I0397b6198c8cfc147e9e7dc30a92a7cb2f5860e3
 2013-03-29 20:28:28 -07:00
Baligh Uddin
80c6d90fef Import translations. DO NOT MERGE 
Change-Id: I709c77b2c45763a2090875189d88c65d28903030
Auto-generated-cl: translation import
 2013-03-29 19:43:43 -07:00
Baligh Uddin
494fd572cc Import translations. DO NOT MERGE 
Change-Id: I846ec473107cdeeb6573445d8faa60ab83fa6946
Auto-generated-cl: translation import
 2013-03-29 19:41:06 -07:00
Amith Yamasani
377002fa1a am 26aca80e: am a7ff2a2d: Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev 
* commit '26aca80eb1813cfe69450383efd8442805b16da5':
  Follow changes to RestrictionEntry API
 2013-03-29 18:56:30 -07:00
Amith Yamasani
26aca80eb1 am a7ff2a2d: Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev 
* commit 'a7ff2a2d22b43197a168655159612c96c90fa335':
  Follow changes to RestrictionEntry API
 2013-03-29 18:51:15 -07:00
Amith Yamasani
a7ff2a2d22 Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev 2013-03-30 01:48:38 +00:00
Amith Yamasani
6e4757f0a6 Follow changes to RestrictionEntry API 
Implement custom restrictions activity.
Fixed some bugs.

Change-Id: I094a6ffcc41c2936f76a8731048d7cb712c1b857
 2013-03-29 18:40:45 -07:00
Kenny Root
419b49882a am 47704d08: am 43366b2c: Merge "Add KeyStore storage type to Settings UI" 
* commit '47704d08b8756d78d426100b97a4fa81b81f12b3':
  Add KeyStore storage type to Settings UI
 2013-03-29 16:46:39 -07:00
Kenny Root
47704d08b8 am 43366b2c: Merge "Add KeyStore storage type to Settings UI" 
* commit '43366b2c546045f3b554427bc6e97a6b529ab66a':
  Add KeyStore storage type to Settings UI
 2013-03-29 16:45:15 -07:00
Maggie Benthall
6ad2e323f7 When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls. 
Under Settings > Storage, remove the "USB computer connection" menu item.
In case someone launches the UsbSettings screen instead, also disable those checkboxes.

Change-Id: I59ec8b16bed4670beeac8d359e5368e4a659061b
 2013-03-29 18:59:33 -04:00
Kenny Root
265398ecb3 am ab6a6645: Merge "Add KeyStore storage type to Settings UI" into jb-mr2-dev 
* commit 'ab6a6645b01312816fe0688c76b5a26948252850':
  Add KeyStore storage type to Settings UI
 2013-03-29 14:36:30 -07:00
Fabrice Di Meglio
a8a4373a09 am fee612df: Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev 
* commit 'fee612df197ab3da969dff39ecc3df95b931cfae':
  Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode
 2013-03-29 14:36:01 -07:00
Irfan Sheriff
016a391ad7 am 0f41b49d: Add install support for WIFI UID 
* commit '0f41b49d1f33e86ec4e7004f009c074b68a90be6':
  Add install support for WIFI UID
 2013-03-29 14:35:32 -07:00
Kenny Root
ab6a6645b0 Merge "Add KeyStore storage type to Settings UI" into jb-mr2-dev 2013-03-29 21:24:48 +00:00
Kenny Root
028634b6af Add KeyStore storage type to Settings UI 
Give the user an idea of what kind of credential storage is in use on
this device for keystore daemon.

(cherry picked from commit 39b56008be)

Change-Id: Id89a1e210b3627914f080b0925bd0d0585872dd2
 2013-03-29 14:23:30 -07:00
Kenny Root
43366b2c54 Merge "Add KeyStore storage type to Settings UI" 2013-03-29 21:09:47 +00:00
Fabrice Di Meglio
fee612df19 Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev 2013-03-29 19:41:13 +00:00