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

15105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adam Lesinski
f9890b6092 am 9b350ac6: am 6717ce01: am 366e7a20: Fix UsageStats permissions in Settings 
* commit '9b350ac6d0a4cf34b242f706339551f56ff3b477':
  Fix UsageStats permissions in Settings
 2014-08-01 20:59:14 +00:00
Alexandra Gherghina
aeac60adae am b5b10aa4: am 4d90a69d: am 80e1f1bf: Extract common functionality for profile spinner into Utils 
* commit 'b5b10aa4cf92db63ad4df2cf9a671e7bdc842843':
  Extract common functionality for profile spinner into Utils
 2014-08-01 20:59:13 +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
Amith Yamasani
d1b5c1deac am f1602f81: am 9980cf7c: Merge "Dialog on phone shouldn\'t say tablet" into lmp-dev 
* commit 'f1602f811a25c5dcbb821653090f1fce2ffa3b7a':
  Dialog on phone shouldn't say tablet
 2014-08-01 13:49:45 +00:00
Adam Lesinski
9b350ac6d0 am 6717ce01: am 366e7a20: Fix UsageStats permissions in Settings 
* commit '6717ce010993c94f8d071ae64c54c99d46e537b8':
  Fix UsageStats permissions in Settings
 2014-08-01 13:48:56 +00:00
Alexandra Gherghina
b5b10aa4cf am 4d90a69d: am 80e1f1bf: Extract common functionality for profile spinner into Utils 
* commit '4d90a69da3841462c8272b89867bbb4edb3e8db2':
  Extract common functionality for profile spinner into Utils
 2014-08-01 13:48:42 +00:00
Alexandra Gherghina
1ea554698e am 9aaa3af4: am 6bcca8b7: Modify user spinner appearance to match mocks 
* commit '9aaa3af4b5e07f9e88e485c8d3db21f0f993932f':
  Modify user spinner appearance to match mocks
 2014-08-01 13:48:41 +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
Adam Lesinski
6717ce0109 am 366e7a20: Fix UsageStats permissions in Settings 
* commit '366e7a20c4d716c3d260faef929f0e8d6be267fb':
  Fix UsageStats permissions in Settings
 2014-07-31 19:14:54 +00:00
Adam Lesinski
366e7a20c4 Fix UsageStats permissions in Settings 
AppOpsManager returns all permission for all users. We need
to check that the permission we're getting is actually for
our user.

Change-Id: I8287d2dc1959d4a22c19ebb2d24136324e04cd2b
 2014-07-31 19:12:09 +00:00
Alexandra Gherghina
4d90a69da3 am 80e1f1bf: Extract common functionality for profile spinner into Utils 
* commit '80e1f1bfdb814a08fb8b07b2e279285d495042e9':
  Extract common functionality for profile spinner into Utils
 2014-07-31 18:43:06 +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
80e1f1bfdb Extract common functionality for profile spinner into Utils 
Bug: 16645615
Change-Id: Ic8928fff8294cd99eeb86b69b44b8e4128cadf92
 2014-07-31 18:38:47 +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
2d0e57ddaa am ea01d406: am 6b3b7514: Update icon and text for a managed profile 
* commit 'ea01d4062faa136566a09f0ee75e702abfe1df5a':
  Update icon and text for a managed profile
 2014-07-31 13:28:48 +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
55e5d2a844 am 6dd54c30: (-s ours) am c8f7dff0: (-s ours) am 86bf735a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6dd54c30cedf113d148e660876676327dada6718':
  Import translations. DO NOT MERGE
 2014-07-31 01:57:08 +00:00
Geoff Mendal
6dd54c30ce am c8f7dff0: (-s ours) am 86bf735a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c8f7dff0bb14a4af78f33999b00bf25577b86657':
  Import translations. DO NOT MERGE
 2014-07-31 01:52:48 +00:00
Geoff Mendal
c8f7dff0bb am 86bf735a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '86bf735aae6714225a4c12bb032efebebbbfca84':
  Import translations. DO NOT MERGE
 2014-07-31 01:49:18 +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
PauloftheWest
4c8e1c3c7e am fceeab3c: am 52d98cac: am d94e78b4: Merge "Fixed crash when changing orientation in the Add Networks dialog." into lmp-dev 
* commit 'fceeab3cb0f7e1712e730d403d1f64183177d55f':
  Fixed crash when changing orientation in the Add Networks dialog.
 2014-07-30 22:36:14 +00:00
PauloftheWest
fceeab3cb0 am 52d98cac: am d94e78b4: Merge "Fixed crash when changing orientation in the Add Networks dialog." into lmp-dev 
* commit '52d98cac7f26b62cff73c52d0fa11fdf21a4b0d3':
  Fixed crash when changing orientation in the Add Networks dialog.
 2014-07-30 22:32:36 +00:00
PauloftheWest
52d98cac7f am d94e78b4: Merge "Fixed crash when changing orientation in the Add Networks dialog." into lmp-dev 
* commit 'd94e78b4b2434259abb72563ee431b8312210ce0':
  Fixed crash when changing orientation in the Add Networks dialog.
 2014-07-30 22:26:36 +00:00
Julia Reynolds
4f058529f8 am 195d8251: am c39fcc87: am a71d7056: Merge "Fix issue with pin prompt." into lmp-dev 
* commit '195d8251056fbaeac7ad2abceea692ade4f38790':
  Fix issue with pin prompt.
 2014-07-30 21:03:36 +00:00
Julia Reynolds
195d825105 am c39fcc87: am a71d7056: Merge "Fix issue with pin prompt." into lmp-dev 
* commit 'c39fcc87a7970f371d7afce3ed9ff6bffd258fb7':
  Fix issue with pin prompt.
 2014-07-30 20:59:15 +00:00
Julia Reynolds
c39fcc87a7 am a71d7056: Merge "Fix issue with pin prompt." into lmp-dev 
* commit 'a71d7056503121fea26ce58fa8996871b4b10d25':
  Fix issue with pin prompt.
 2014-07-30 20:54:56 +00:00
Christoph Studer
0bf30e0e58 am 11722ee0: am 54aff114: am fe1b8950: Update NotificationStation after NotificationListenerService API change 
* commit '11722ee0115bdb02f4217b77c0793b809dd80c03':
  Update NotificationStation after NotificationListenerService API change
 2014-07-30 19:45:04 +00:00
Christoph Studer
11722ee011 am 54aff114: am fe1b8950: Update NotificationStation after NotificationListenerService API change 
* commit '54aff114bf013f2939a4ce61da598202efb2bf78':
  Update NotificationStation after NotificationListenerService API change
 2014-07-30 19:41:39 +00:00
Christoph Studer
54aff114bf am fe1b8950: Update NotificationStation after NotificationListenerService API change 
* commit 'fe1b8950bc02d96f2675505ee0aa95146831465b':
  Update NotificationStation after NotificationListenerService API change
 2014-07-30 19:36:46 +00:00
Christoph Studer
fe1b8950bc Update NotificationStation after NotificationListenerService API change 
Change-Id: Ia58c18657c44c0dd49b058ce5b581554889b08d5
 2014-07-30 19:32:54 +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
PauloftheWest
d94e78b4b2 Merge "Fixed crash when changing orientation in the Add Networks dialog." into lmp-dev 2014-07-30 19:31:16 +00:00
PauloftheWest
fd19aff782 Fixed crash when changing orientation in the Add Networks dialog. 
Bug: 16479540
Change-Id: Ib42977b72039f49b5d5ae688c0b0ded1094b44e2
 2014-07-30 15:16:38 -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
1d739f1e9f am 6d5c0e41: am 3ded7ddb: Merge "Work around an icu4c bug in TimeZoneNames::getDisplayName." into lmp-dev 
* commit '6d5c0e411ca35cbdc80cc443e5c6794592c82444':
  Work around an icu4c bug in TimeZoneNames::getDisplayName.
 2014-07-30 19:02:06 +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
PauloftheWest
8a084d6d26 am 86dc1219: am bb60518a: am fc0c3b43: Merge "Set new PBAP connections to always allow." into lmp-dev 
* commit '86dc1219a632ebcab1d7d895133e6143949e7a00':
  Set new PBAP connections to always allow.
 2014-07-30 18:33:16 +00:00
PauloftheWest
86dc1219a6 am bb60518a: am fc0c3b43: Merge "Set new PBAP connections to always allow." into lmp-dev 
* commit 'bb60518aec360f135da650afe4b0a448d2ec46b0':
  Set new PBAP connections to always allow.
 2014-07-30 18:28:24 +00:00
PauloftheWest
bb60518aec am fc0c3b43: Merge "Set new PBAP connections to always allow." into lmp-dev 
* commit 'fc0c3b43dfe420ef29dfa4fc576ffc486bc2266a':
  Set new PBAP connections to always allow.
 2014-07-30 18:25:01 +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
John Spurlock
d66e91de2f am a5638b0c: am d117a96e: Merge "Settings: Fix ordering for interruptions alarm warning." into lmp-dev 
* commit 'a5638b0c877b46fc0ad38eb695cc22af6fa8e300':
  Settings: Fix ordering for interruptions alarm warning.
 2014-07-30 16:58:21 +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