PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,395 Commits 1 Branch 0 Tags
e09e245173f8c79a0d1484b5ce3e5c7d014d7a3a
Commit Graph

5934 Commits

Author SHA1 Message Date
Alexandra Gherghina
b896591562 am 707c9653: am 76cc239f: am fe47a8dc: Toggle between primary and managed profile in Print Settings 
* commit '707c96533ca204270bdf87120ac7f897ed3f6098':
  Toggle between primary and managed profile in Print Settings
 2014-07-29 13:32:09 +00:00
Zoltan Szatmary-Ban
b77ef9bee2 am 74f34e49: Merge "Update Data Usage Settings for Enterprise" into lmp-dev 
* commit '74f34e496fc460842aa558512de03187f5ad9b2c':
  Update Data Usage Settings for Enterprise
 2014-07-29 12:49:27 +00:00
Alexandra Gherghina
76cc239fba am fe47a8dc: Toggle between primary and managed profile in Print Settings 
* commit 'fe47a8dc89fe0393dae16b1c2152c901feab4dcb':
  Toggle between primary and managed profile in Print Settings
 2014-07-29 12:49:25 +00:00
Alexandra Gherghina
fe47a8dc89 Toggle between primary and managed profile in Print Settings 
This adds a spinner to the print settings screen which can be used to toggle
between the Settings app in the primary and managed profile so that the user
can edit settings belonging to both profiles.

Bug: 16369104
Change-Id: I2556a331d09379c2a501bc6b192ab1631b5215f5
 2014-07-29 10:22:15 +01:00
Fabrice Di Meglio
cf1752b615 am d173e0fc: am bbd076c1: am 173e3161: Merge "Some code formatting" into lmp-dev 
* commit 'd173e0fc32edfdb4ed674374177795e30b2733a5':
  Some code formatting
 2014-07-29 01:14:56 +00:00
Fabrice Di Meglio
bbd076c1f3 am 173e3161: Merge "Some code formatting" into lmp-dev 
* commit '173e31619a34436e8cb100fb30f0e3477b7edf8e':
  Some code formatting
 2014-07-29 01:03:58 +00:00
Alan Viverette
fddbd32d52 am 4ebe4792: am 6c27489f: am 744c6b22: Remove TimePicker and DatePicker dialog themes 
* commit '4ebe479243dc4d54607644bb643d3d1ee37fdfc0':
  Remove TimePicker and DatePicker dialog themes
 2014-07-29 01:02:34 +00:00
Alan Viverette
6c27489f40 am 744c6b22: Remove TimePicker and DatePicker dialog themes 
* commit '744c6b22513f3b51f035b2038a59d35c97c4da6c':
  Remove TimePicker and DatePicker dialog themes
 2014-07-29 00:47:58 +00:00
Alan Viverette
744c6b2251 Remove TimePicker and DatePicker dialog themes 
Also moves TimePicker widget style to appropriate XML file / namespace.

BUG: 14973897
Change-Id: I0eb68a59d8f2800d37cc949c948689d47c34486f
 2014-07-29 00:06:20 +00:00
Fabrice Di Meglio
cd3c9694bf am e4b58073: am 90bfe0cf: am d197608e: Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev 
* commit 'e4b580732aa71bfc29e9ccc2f98b069a51ec73c3':
  Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security
 2014-07-28 23:35:57 +00:00
Fabrice Di Meglio
90bfe0cf7e am d197608e: Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev 
* commit 'd197608e8340765e736c234dabffae8d3dc695e1':
  Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security
 2014-07-28 23:15:47 +00:00
Fabrice Di Meglio
173e31619a Merge "Some code formatting" into lmp-dev 2014-07-28 22:45:16 +00:00
Fabrice Di Meglio
9e041f02ec Some code formatting 
- add some extra lines into those XML layout files

Change-Id: I13c004f23a5c59d46702a93b1cfa7e9b9587b8c2
 2014-07-28 17:54:30 -07:00
Fabrice Di Meglio
1d5b910f1c Fix bug #14323097 Launching Security from Settings search results 
...show header as Settings instead of Security

- add missing title to a few fragments

Change-Id: I74fb95ca58269ff1c77afa20ed40e7042873130c
 2014-07-28 15:47:21 -07:00
Fabrice Di Meglio
d197608e83 Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev 2014-07-28 22:45:16 +00:00
Jeff Davidson
a117f13337 am 2eb61429: am 92126c1c: am 6207391a: Fix strings for Wi-Fi Assistant dialog. 
* commit '2eb61429f8593cc9b1dda6b1714e784d4c624c11':
  Fix strings for Wi-Fi Assistant dialog.
 2014-07-28 20:54:25 +00:00
Jeff Davidson
92126c1c9c am 6207391a: Fix strings for Wi-Fi Assistant dialog. 
* commit '6207391ac240d130194f1a0cad7b5f10535d45ac':
  Fix strings for Wi-Fi Assistant dialog.
 2014-07-28 20:41:15 +00:00
Jeff Davidson
6207391ac2 Fix strings for Wi-Fi Assistant dialog. 
Remove some redundant strings that are no longer needed.

Change-Id: I039839989358efa322bac13129d91f7c764fd387
 2014-07-28 13:35:41 -07:00
PauloftheWest
a4cfc0f386 am 57043d83: am 7359836b: am 069ed0a6: Merge "Minor character limit fixes for translation." into lmp-dev 
* commit '57043d837e2a41dc6b8ae9c9bfe5dab95dd5441c':
  Minor character limit fixes for translation.
 2014-07-28 18:52:25 +00:00
PauloftheWest
7359836b01 am 069ed0a6: Merge "Minor character limit fixes for translation." into lmp-dev 
* commit '069ed0a678dca7a00fb236ed3ba5e54ea4ee2905':
  Minor character limit fixes for translation.
 2014-07-28 18:43:47 +00:00
PauloftheWest
27ac35f542 am bc83acc2: am 0314d6d6: am 76c70b07: Merge "Fixed minor character limits for translation." into lmp-dev 
* commit 'bc83acc2ede2ea255a5d0c3fb280aaf5c51b389e':
  Fixed minor character limits for translation.
 2014-07-28 18:07:37 +00:00
PauloftheWest
0314d6d694 am 76c70b07: Merge "Fixed minor character limits for translation." into lmp-dev 
* commit '76c70b07270f3e0bea5e94f172d5115c8dffef12':
  Fixed minor character limits for translation.
 2014-07-28 17:49:35 +00:00
Alexandra Gherghina
bb4b982efe am 0d05a314: am 3f0140ec: am 28ff0ff0: Update string displayed when we can\'t remove an account 
* commit '0d05a3145af8a612847ea9fbd26c3236c8cb07c6':
  Update string displayed when we can't remove an account
 2014-07-28 14:37:19 +00:00
Alexandra Gherghina
3f0140ec4d am 28ff0ff0: Update string displayed when we can\'t remove an account 
* commit '28ff0ff0f19b3ef2a665d72020509d106bf6e73f':
  Update string displayed when we can't remove an account
 2014-07-28 14:29:59 +00:00
Alexandra Gherghina
28ff0ff0f1 Update string displayed when we can't remove an account 
Bug: 14642886
Change-Id: Ie4a902cfd1ae41f2a1bae28432874e7b8b34b50d
 2014-07-28 15:24:34 +01:00
Baligh Uddin
c4108655e1 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-27 22:35:46 +00:00
Baligh Uddin
8f7b82bec8 Import translations. DO NOT MERGE 
Change-Id: I9653e86e7b7264646b35675fd40f6d582dc09d58
Auto-generated-cl: translation import
 2014-07-28 13:01:38 -07:00
Amith Yamasani
af25bacd53 am 6b913056: am 5573c5e3: am bed3a7b6: Merge "Increase string lengths for translation" into lmp-dev 
* commit '6b9130569af25d3ada71dc8268b21c15e62ee2d4':
  Increase string lengths for translation
 2014-07-27 11:49:14 +00:00
Amith Yamasani
5573c5e3cd am bed3a7b6: Merge "Increase string lengths for translation" into lmp-dev 
* commit 'bed3a7b6aa64a82504057a10a1c38a82feffcc38':
  Increase string lengths for translation
 2014-07-27 11:30:12 +00:00
Amith Yamasani
fbd4da78ec am b92d97ed: am ee4e67aa: am 1a77577d: Change tablet to device so it doesn\'t say tablet on a phone 
* commit 'b92d97ed8fcdf66b0276e9f5b74cba1f4837659b':
  Change tablet to device so it doesn't say tablet on a phone
 2014-07-27 00:04:02 +00:00
Amith Yamasani
ee4e67aa27 am 1a77577d: Change tablet to device so it doesn\'t say tablet on a phone 
* commit '1a77577da755b0921a3b77fc66ff9b99b50b59f6':
  Change tablet to device so it doesn't say tablet on a phone
 2014-07-26 23:57:25 +00:00
Amith Yamasani
1a77577da7 Change tablet to device so it doesn't say tablet on a phone 
Bug: 16447351
Change-Id: I3d10e1e1546602c4155de70650e6f9ee582fe552
 2014-07-26 16:47:00 -07:00
Amith Yamasani
1d54c06a24 am de2ead8f: am 44a0acfc: am 247520c3: More User Settings improvements 
* commit 'de2ead8f67c0b7f6f053e428044b0862baeae75e':
  More User Settings improvements
 2014-07-26 14:22:32 +00:00
Amith Yamasani
44a0acfcb6 am 247520c3: More User Settings improvements 
* commit '247520c369370885a1c085e53ee679dce0fd55ce':
  More User Settings improvements
 2014-07-26 14:16:15 +00:00
Amith Yamasani
247520c369 More User Settings improvements 
Add a menu checkbox to allow creation of users from lockscreen.
Add a delete icon in restricted profiles settings.
Other little fixes to icons.
Update some strings based on feedback.

Bug: 15761405
Bug: 16550371
Bug: 16298824

Change-Id: Ib876bd57f15c6ce2d71856f72571c6b8b0e3102d
 2014-07-26 14:09:43 +00:00
Fabrice Di Meglio
5c14856ba2 Merge "Fix bug #16306535 The arrows rotate in the opposite direction... of the direction implied by the iconography (clockwise)" into lmp-dev 2014-07-25 23:01:28 +00:00
Fabrice Di Meglio
fb49019855 Fix bug #16306535 The arrows rotate in the opposite direction... 
of the direction implied by the iconography (clockwise)

- update assets with correct direction

Change-Id: I56ff28cd2207577726b5136191317fae325c1bed
 2014-07-29 17:08:41 -07:00
Fabrice Di Meglio
6911f9cf63 Fix bug #16660819 Switchbar text should be white not grey 
- use "?android:attr/textColorPrimary" so that we are white
and matching the color of the Activity Title

Change-Id: I18bc47d2080fcc171b86e5b56bfc86bbe8637caa
 2014-07-29 16:54:44 -07:00
Fabrice Di Meglio
6d9a59f02d Merge "Fix bug #16660819 Switchbar text should be white not grey" into lmp-dev 2014-07-25 23:01:28 +00:00
Svetoslav
0b4cf14400 Merge "Removing lock screen app widget code" into lmp-dev 2014-07-25 23:00:08 +00:00
Svetoslav
528e6c307a Removing lock screen app widget code 
This feature is no longer suppored and this change removes
the related code from settings.

Change-Id: I156107740f20b096f44fa2880ef6dcad9f311a73
 2014-07-31 01:57:09 +00:00
Amith Yamasani
b8e0f608cf Implement SET_PROFILE_OWNER intent 
This will be shown when a system priv-app tries to add a profile owner
to a device that's already been through setupwizard.

Refactored the Add Device Admin dialog to also be used for this
purpose with additional warning text.

Also, make sure that profile owners cannot be deactivated.

Bug: 16207721
Change-Id: I25499a22718b2219a5a56b158ca2681243751549
 2014-07-29 13:50:40 -07:00
Amith Yamasani
bed3a7b6aa Merge "Increase string lengths for translation" into lmp-dev 2014-07-25 21:16:23 +00:00
Amith Yamasani
1a4c1b080c Increase string lengths for translation 
Bug: 16062154
Change-Id: Ib0086f23283f324a18f71ec5f8bab9275567c59f
 2014-07-26 22:54:40 -07:00
Alan Viverette
29850a82d0 am ab01ab4c: am 869d18af: am 06363397: Remove -opia color correction modes 
* commit 'ab01ab4c4df86c8106f7806c9afde8e2c5ae92bc':
  Remove -opia color correction modes
 2014-07-25 19:54:21 +00:00
Alan Viverette
869d18af2d am 06363397: Remove -opia color correction modes 
* commit '063633971283a2dd342fc032d3cef65d03de0125':
  Remove -opia color correction modes
 2014-07-25 19:46:56 +00:00
Alan Viverette
0636339712 Remove -opia color correction modes 
The implementations for these are identical to -omaly modes.

Change-Id: Iad67c01d17c6167c530879fa29178ba63a8b876b
 2014-07-25 19:41:04 +00:00
Paul Lawrence
d8e4b338e4 am 72c677c4: am 54579a9e: am 0ee45d5b: Fix Trusted Credentials layout 
* commit '72c677c4590b098bf53b3d319fa4d007b5affb76':
  Fix Trusted Credentials layout
 2014-07-25 19:25:38 +00:00
Paul Lawrence
54579a9ef3 am 0ee45d5b: Fix Trusted Credentials layout 
* commit '0ee45d5bdc559ba7746dc803429268e8b6dd2092':
  Fix Trusted Credentials layout
 2014-07-25 18:47:41 +00:00
Paul Lawrence
0ee45d5bdc Fix Trusted Credentials layout 
Now matches security layout. Tested on Volantis and Hammerhead in portrait
and landscape

Bug: 16381087
Change-Id: If7049f6cd241df360d9fb608e1e7e5d45e3d1d54
 2014-07-25 18:20:52 +00:00