PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,988 Commits 1 Branch 0 Tags
02afa3d95d798618e86dc812c136df5eb372ab23
Commit Graph

5126 Commits

Author SHA1 Message Date
Zoltan Szatmary-Ban
5120b21eeb am f3d72098: Update Device Admins Settings screen 
* commit 'f3d72098b0008a9a8e137985d7fbc0e0470adc9c':
  Update Device Admins Settings screen
 2014-08-01 11:51:26 +00:00
Zoltan Szatmary-Ban
f3d72098b0 Update Device Admins Settings screen 
The MDM is a Device Admin for the managed profile. The users should be able to see that it exists
and it is controlling the device, but they should not be able to change it.

Bug: 15558397

Change-Id: Ief372b606f1085f73c98ace97f2c1d9ac5fe3257
 2014-08-01 09:29:33 +00:00
Maurice Lam
86163b6bcd Merge "[WifiSetup] Fixed setup strings CHAR LIMIT" into lmp-dev 2014-08-01 08:29:25 +00:00
Maurice Lam
a6e7f3dd93 [WifiSetup] Fixed setup strings CHAR LIMIT 
Bumped the CHAR LIMIT of "Skip" button to 20, and added the same CHAR
LIMIT to "Next".

Bug: 16116325
Change-Id: Iafdab3712fdbfac0c53d3ef73d1da8910bc9433b
 2014-08-04 15:11:33 -07:00
PauloftheWest
3eb8a711fe am 33734f58: Cheanged Call Manager\'s summary to be parameter. 
* commit '33734f58d5894829c5821c39727f6dae2c951167':
  Cheanged Call Manager's summary to be parameter.
 2014-07-31 22:33:52 +00:00
PauloftheWest
33734f58d5 Cheanged Call Manager's summary to be parameter. 
Bug: 16300328
Change-Id: I4a3a4a80060ac6d464adc5f666d02dabe635707c
 2014-07-31 22:27:16 +00:00
Svetoslav
f66c67db46 am 0b4cf144: Merge "Removing lock screen app widget code" into lmp-dev 
* commit '0b4cf14400a42a3d0f461386f22d3dd7d69dd88f':
  Removing lock screen app widget code
 2014-07-31 21:55:09 +00:00
Amith Yamasani
f1602f811a am 9980cf7c: Merge "Dialog on phone shouldn\'t say tablet" into lmp-dev 
* commit '9980cf7c9927451b1370dab8afb8357542c10e8c':
  Dialog on phone shouldn't say tablet
 2014-07-31 20:52:42 +00:00
Alexandra Gherghina
9aaa3af4b5 am 6bcca8b7: Modify user spinner appearance to match mocks 
* commit '6bcca8b7ae3fab4609f67f32a52a10d4143093a9':
  Modify user spinner appearance to match mocks
 2014-07-31 18:43:06 +00:00
Alexandra Gherghina
ea01d4062f am 6b3b7514: Update icon and text for a managed profile 
* commit '6b3b751492d01b23b87a4ee6b807dc00c3b5770e':
  Update icon and text for a managed profile
 2014-07-31 13:07:02 +00:00
Alexandra Gherghina
6bcca8b7ae Modify user spinner appearance to match mocks 
Bug: 16518801
Change-Id: I30aa65251d4a4aaa80dbde5881fc56fffb7d54f7
 2014-07-31 11:31:24 +01:00
Alexandra Gherghina
6b3b751492 Update icon and text for a managed profile 
Bug: 16369104
Change-Id: I15d25910332d92e1638cdc63422e7e28c2f07d85
 2014-07-31 10:24:16 +00:00
Geoff Mendal
86bf735aae Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-30 19:31:16 +00:00
Geoff Mendal
a7a08fd726 Import translations. DO NOT MERGE 
Change-Id: I1b93e4357544ff5ce9bf18351ed34009ba06c5f5
Auto-generated-cl: translation import
 2014-07-30 18:31:14 -07:00
Elliott Hughes
6d5c0e411c am 3ded7ddb: Merge "Work around an icu4c bug in TimeZoneNames::getDisplayName." into lmp-dev 
* commit '3ded7ddb1f54045842bbea8ea03e939443d17808':
  Work around an icu4c bug in TimeZoneNames::getDisplayName.
 2014-07-30 18:55:09 +00:00
John Spurlock
a5638b0c87 am d117a96e: Merge "Settings: Fix ordering for interruptions alarm warning." into lmp-dev 
* commit 'd117a96e00ab2df2d523e4a62825cf90851dc342':
  Settings: Fix ordering for interruptions alarm warning.
 2014-07-30 16:38:45 +00:00
PauloftheWest
33c02c981b am 361d870e: Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs 
* commit '361d870e5415f8642cb106b4329d194673b4dd02':
  Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs
 2014-07-30 16:19:48 +00:00
PauloftheWest
361d870e54 Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs 
Bug: 16040292
Change-Id: Ieeaa014052f53787cf7057578e0b2ac048dc6eb1
 2014-07-30 08:39:46 -07:00
Alexandra Gherghina
2653fe3c0f am c8a1db19: Toggle between primary and managed profile in apps settings 
* commit 'c8a1db191207e38b7ad0acdfd276651e4911e812':
  Toggle between primary and managed profile in apps settings
 2014-07-30 12:58:32 +00:00
Amith Yamasani
9980cf7c99 Merge "Dialog on phone shouldn't say tablet" into lmp-dev 2014-07-30 11:24:38 +00:00
Amith Yamasani
9bfdeab948 Dialog on phone shouldn't say tablet 
Bug: 14607100
Change-Id: I5c3e023b94697f58c61122d530abaed406862201
 2014-07-31 13:29:42 -07:00
Alexandra Gherghina
c8a1db1912 Toggle between primary and managed profile in apps settings 
This adds a spinner to the apps 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: I09a94c07597e6509de025dfbbe0e454ae3d9b0aa
 2014-07-30 09:15:38 +00:00
Fabrice Di Meglio
4b3e46ea18 am 5c14856b: Merge "Fix bug #16306535 The arrows rotate in the opposite direction... of the direction implied by the iconography (clockwise)" into lmp-dev 
* commit '5c14856ba2cafeb00080355f7613a702779ca530':
  Fix bug #16306535 The arrows rotate in the opposite direction... of the direction implied by the iconography (clockwise)
 2014-07-30 01:10:20 +00:00
Fabrice Di Meglio
7bdfe7fb83 am 6d9a59f0: Merge "Fix bug #16660819 Switchbar text should be white not grey" into lmp-dev 
* commit '6d9a59f02df1bb9fae5974c510cd3eedf90fa5ce':
  Fix bug #16660819 Switchbar text should be white not grey
 2014-07-30 01:10:14 +00:00
Amith Yamasani
736ea0e8a8 am ba9643b9: Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev 
* commit 'ba9643b92c6fa481152f55b862442f609c1e7410':
  Implement SET_PROFILE_OWNER intent
 2014-07-29 23:47:00 +00:00
John Spurlock
d117a96e00 Merge "Settings: Fix ordering for interruptions alarm warning." into lmp-dev 2014-07-29 22:44:51 +00:00
John Spurlock
8ef00dfe4b Settings: Fix ordering for interruptions alarm warning. 
And update the string to the latest.

Bug:16662819
Change-Id: I42b38ab4721180babfd816a34a1fb1c368546cca
 2014-07-30 12:33:04 -04:00
Fabrice Di Meglio
c13c0bd5dd am d5ec63ad: Merge "Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum" into lmp-dev 
* commit 'd5ec63ad5166b2a6530c2958819a053cccf4ec79':
  Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum
 2014-07-29 17:24:31 +00:00
Alexandra Gherghina
6d09e061ef am 4a45be2f: Merge "Move global sync settings dialogs to the right screen" into lmp-dev 
* commit '4a45be2ff83e1b3b9bd52be523639d100311bec3':
  Move global sync settings dialogs to the right screen
 2014-07-29 15:31:48 +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
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
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
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
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
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
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
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
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
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