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
John Spurlock
99089e8990 am b86bd00a: am 0062d87a: am 249cf50b: Settings: Battery saver updates. 
* commit 'b86bd00a8862c6185fad1815345af662869fb68e':
  Settings: Battery saver updates.
 2014-08-03 02:02:21 +00:00
John Spurlock
0062d87ae3 am 249cf50b: Settings: Battery saver updates. 
* commit '249cf50b19c5b1d9ddce0667fb9d439fcdb6f033':
  Settings: Battery saver updates.
 2014-08-03 01:54:21 +00:00
John Spurlock
249cf50b19 Settings: Battery saver updates. 
- Fewer trigger level options, new default of 0 (never)
 - Use new shared feature description text (in framework)
 - Remove "always on", add new top-level switch bar.

Depends on the framework changes in I3d1ded1eec9e63e7d97469486f6a320e1bebbccd

Bug:16214395
Change-Id: Ia01186cfeb19d00672f62cc84787584b4dcc1143
 2014-08-02 17:23:46 -04:00
Zoltan Szatmary-Ban
b0a3e71e01 am 11ea340c: am 5120b21e: am f3d72098: Update Device Admins Settings screen 
* commit '11ea340c59abb7e521e6c9ad5250a5e28cbdb331':
  Update Device Admins Settings screen
 2014-08-01 20:59:20 +00:00
PauloftheWest
09db4fefd4 am dbaad4f9: am 3eb8a711: am 33734f58: Cheanged Call Manager\'s summary to be parameter. 
* commit 'dbaad4f99b70dfcc3aaf08d5e00852747afd08ee':
  Cheanged Call Manager's summary to be parameter.
 2014-08-01 20:59:16 +00:00
Svetoslav
650ca7a4c7 am a017a4a2: am f66c67db: am 0b4cf144: Merge "Removing lock screen app widget code" into lmp-dev 
* commit 'a017a4a202bf56708e1149e2235604a283e56b3b':
  Removing lock screen app widget code
 2014-08-01 20:59:15 +00:00
Amith Yamasani
e80f81accf am d1b5c1de: am f1602f81: am 9980cf7c: Merge "Dialog on phone shouldn\'t say tablet" into lmp-dev 
* commit 'd1b5c1deac126728c970e806e8bcfc04ac6bb87b':
  Dialog on phone shouldn't say tablet
 2014-08-01 20:59:14 +00:00
Alexandra Gherghina
a9d051ef4b am 1ea55469: am 9aaa3af4: am 6bcca8b7: Modify user spinner appearance to match mocks 
* commit '1ea554698e018da02d5a748b582d0496f68819e8':
  Modify user spinner appearance to match mocks
 2014-08-01 20:59:12 +00:00
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
34c135757d am 2d0e57dd: am ea01d406: am 6b3b7514: Update icon and text for a managed profile 
* commit '2d0e57ddaa72e83672eaa76f00ae3099e798d408':
  Update icon and text for a managed profile
 2014-07-31 13:42:32 +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
767cf5313f Merge "Import translations. DO NOT MERGE" 2014-07-30 23:34:26 +00:00
Geoff Mendal
179544d151 Import translations. DO NOT MERGE 
Change-Id: I7a8d40cfecee4835e65e0366a8cfe0f05a3dace2
Auto-generated-cl: translation import
 2014-07-30 18:41:18 -07: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
6f88971602 am 1d739f1e: am 6d5c0e41: am 3ded7ddb: Merge "Work around an icu4c bug in TimeZoneNames::getDisplayName." into lmp-dev 
* commit '1d739f1e9f5eb8bfce1deb8375bf967dc9e8d862':
  Work around an icu4c bug in TimeZoneNames::getDisplayName.
 2014-07-30 19:06:11 +00: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
fdbee1a8e4 am d66e91de: am a5638b0c: am d117a96e: Merge "Settings: Fix ordering for interruptions alarm warning." into lmp-dev 
* commit 'd66e91de2f98005a780e54d90dee15d519a5627d':
  Settings: Fix ordering for interruptions alarm warning.
 2014-07-30 17:11:25 +00:00
PauloftheWest
ce17442f40 am cc58d272: am 33c02c98: am 361d870e: Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs 
* commit 'cc58d2722b69ee815b50e557b6c7f0f1cbca5d0d':
  Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs
 2014-07-30 16:55:45 +00:00
Alexandra Gherghina
c205b1fe8b am 8fbbeb9e: am 2653fe3c: am c8a1db19: Toggle between primary and managed profile in apps settings 
* commit '8fbbeb9efda5f9a524e3abdaa7d5729bad44cea9':
  Toggle between primary and managed profile in apps settings
 2014-07-30 16:55:39 +00:00
Fabrice Di Meglio
a3367ba5a4 am 1f9bf5f5: am 4b3e46ea: 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 '1f9bf5f57b1e3e1a5af4a7adeb3e8fd98d3158e3':
  Fix bug #16306535 The arrows rotate in the opposite direction... of the direction implied by the iconography (clockwise)
 2014-07-30 16:55:27 +00:00
Fabrice Di Meglio
a1a8eadc6d am 8156332a: am 7bdfe7fb: am 6d9a59f0: Merge "Fix bug #16660819 Switchbar text should be white not grey" into lmp-dev 
* commit '8156332a7e9a63564685ba80d325766ae2cc5341':
  Fix bug #16660819 Switchbar text should be white not grey
 2014-07-30 16:55:26 +00:00
Amith Yamasani
f2f9098e20 am 62a188e9: am 736ea0e8: am ba9643b9: Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev 
* commit '62a188e98ff4c5f495e0a376bb481a71719200ac':
  Implement SET_PROFILE_OWNER intent
 2014-07-30 16:55:26 +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
7521693e66 am 23955e33: am c13c0bd5: am d5ec63ad: Merge "Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum" into lmp-dev 
* commit '23955e3362d56e14bc6fc5ea063f32ca321c1168':
  Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum
 2014-07-29 17:36:47 +00: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
b4df7f3cc4 am ecd1fac9: am 6d09e061: am 4a45be2f: Merge "Move global sync settings dialogs to the right screen" into lmp-dev 
* commit 'ecd1fac93d6a1b6fa994d445fe7828b63a255362':
  Move global sync settings dialogs to the right screen
 2014-07-29 15:39:26 +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
267b103348 am 7832c091: am b77ef9be: am 74f34e49: Merge "Update Data Usage Settings for Enterprise" into lmp-dev 
* commit '7832c0913db9fa9cabdb3f78d6b6f54467798de5':
  Update Data Usage Settings for Enterprise
 2014-07-29 13:32:11 +00:00