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

15426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandra Gherghina
e5e430849c am 8ea6cbf7: am 9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev 
* commit '8ea6cbf7d9a6f92bb76564c281597341b0ad1ebb':
  Match parent width for user spinner to fix tint
 2014-09-26 20:11:30 +00:00
Alexandra Gherghina
5dab2fd3b2 am c7611429: am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev 
* commit 'c7611429e906423c5f7ba9da80e40bb364c684b1':
  Use plain user icon in UserSpinnerAdapter
 2014-09-26 20:11:29 +00:00
Alexandra Gherghina
8ea6cbf7d9 am 9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev 
* commit '9de68440a9ae9cfadee3939c1ca461e42871f766':
  Match parent width for user spinner to fix tint
 2014-09-26 19:55:28 +00:00
Alexandra Gherghina
c7611429e9 am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev 
* commit '3c3ceb9d42ddd8ee65547183b3685fd088a6676e':
  Use plain user icon in UserSpinnerAdapter
 2014-09-26 19:55:27 +00:00
Alexandra Gherghina
9de68440a9 Merge "Match parent width for user spinner to fix tint" into lmp-dev 2014-09-26 17:53:28 +00:00
Alexandra Gherghina
3c3ceb9d42 Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev 2014-09-26 17:42:49 +00:00
PauloftheWest
6a66232155 am 0c74ea6c: am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev 
* commit '0c74ea6cc58054e8bfb74ee1eda4453ac10567ce':
  Fixed a crash when rotating a WPS dialog.
 2014-09-26 15:04:41 +00:00
PauloftheWest
0c74ea6cc5 am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev 
* commit '3aabfca462af26c487d2a834f70d0998d7556637':
  Fixed a crash when rotating a WPS dialog.
 2014-09-26 14:54:19 +00:00
PauloftheWest
3aabfca462 Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev 2014-09-26 14:47:28 +00:00
Michael Wright
65c402ef9a am 28a049a6: am 1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev 
* commit '28a049a69471f1cdb7dce4490ffea38c1b3f417e':
  If a device identifier is specified, bring up keyboard layouts dialog.
 2014-09-25 22:38:32 +00:00
Michael Wright
28a049a694 am 1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev 
* commit '1b87bec5de17dc23cf63d9f71358b8c979f8c896':
  If a device identifier is specified, bring up keyboard layouts dialog.
 2014-09-25 22:26:59 +00:00
Michael Wright
1b87bec5de Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev 2014-09-25 22:18:34 +00:00
PauloftheWest
a7d31e8164 Fixed a crash when rotating a WPS dialog. 
Bug: 17635632
Change-Id: Ibd4497362dc61a2f82c098889145430740207638
 2014-09-25 12:36:09 -07:00
Zoltan Szatmary-Ban
8c6211b56f am 15f71b3f: am a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev 
* commit '15f71b3f952c97b838a6517b75028ce21e3bd06f':
  Make Force Stop button work for packages of managed profile
 2014-09-25 16:39:17 +00:00
Zoltan Szatmary-Ban
2a26ac58f0 am 6da3f84c: am 7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev 
* commit '6da3f84c9789378d701894a0a65be536da5e220c':
  Start PowerUsageDetails fragment in the correct activity
 2014-09-25 16:39:16 +00:00
Alexandra Gherghina
72cf0cf96d am 94e2341b: am eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev 
* commit '94e2341bb5557b405792d3040cc67ce24a965485':
  Add null check for sync authorities of an account type
 2014-09-25 16:39:16 +00:00
Jeff Sharkey
8acdcf7a52 am a522e9a8: am d642d1ab: Merge "Include reason when wiping data." into lmp-dev 
* commit 'a522e9a83739446bf89d801f7ceac5f7effc3727':
  Include reason when wiping data.
 2014-09-25 16:39:15 +00:00
Zoltan Szatmary-Ban
15f71b3f95 am a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev 
* commit 'a2b7bb6be612fc050fc7634815a614f84fcac778':
  Make Force Stop button work for packages of managed profile
 2014-09-25 16:24:18 +00:00
Zoltan Szatmary-Ban
6da3f84c97 am 7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev 
* commit '7258650efdea447dea6f2f557cb9d2b90df92754':
  Start PowerUsageDetails fragment in the correct activity
 2014-09-25 16:24:17 +00:00
Alexandra Gherghina
94e2341bb5 am eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev 
* commit 'eac7cc5eead6d79fb6e0558d8005b4c8ea1911a1':
  Add null check for sync authorities of an account type
 2014-09-25 16:24:15 +00:00
Jeff Sharkey
a522e9a837 am d642d1ab: Merge "Include reason when wiping data." into lmp-dev 
* commit 'd642d1abcfed427e4c152e28e39b50cdb68b81c6':
  Include reason when wiping data.
 2014-09-25 16:22:25 +00:00
Zoltan Szatmary-Ban
a2b7bb6be6 Merge "Make Force Stop button work for packages of managed profile" into lmp-dev 2014-09-25 10:38:40 +00:00
Zoltan Szatmary-Ban
7258650efd Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev 2014-09-25 10:35:58 +00:00
Alexandra Gherghina
e4124f4743 Match parent width for user spinner to fix tint 
Bug: 17640172
Change-Id: I4cbea855cac9180d193f9ba936ec1bab81df537d
 2014-09-25 11:29:17 +01:00
Alexandra Gherghina
7d3b6b4703 Use plain user icon in UserSpinnerAdapter 
Before, we were using CircleFramedDrawable, used by user settings.
That performs some alterations on the image (adds an outline and
shadow) that made it inconsistent with the corp icon.

Bug: 17561925
Change-Id: I2490360d332a1b93864858122868b571f2949617
 2014-09-25 11:07:42 +01:00
Paul Lawrence
f295f01bcc am 2c4de435: am 29df3796: Merge "Hide controls once password is known good" into lmp-dev 
* commit '2c4de435bf4dfb339fe7b36ab0f9ac93ed8120ce':
  Hide controls once password is known good
 2014-09-25 10:03:46 +00:00
Paul Lawrence
2c4de435bf am 29df3796: Merge "Hide controls once password is known good" into lmp-dev 
* commit '29df37969794aa4db73af0d0fdbcde273aef5ab2':
  Hide controls once password is known good
 2014-09-25 09:51:35 +00:00
Alexandra Gherghina
eac7cc5eea Merge "Add null check for sync authorities of an account type" into lmp-dev 2014-09-25 09:37:58 +00:00
Jeff Sharkey
d642d1abcf Merge "Include reason when wiping data." into lmp-dev 2014-09-24 23:28:00 +00:00
PauloftheWest
00656b8e46 Fixed multiple MAP issues. 
+ Bluetooth Settings properly stores the MAP state as a shared
preference.
+ A Bluetooth's Settings profile will display MAP even if it was
previously denied.

Bug: 17391677
Change-Id: I94dd7d1a75cc4fe09647c85d84d9e3651a07a673
 2014-09-24 16:06:16 -07:00
Paul Lawrence
29df379697 Merge "Hide controls once password is known good" into lmp-dev 2014-09-24 22:59:08 +00:00
Jeff Sharkey
1de688d911 Include reason when wiping data. 
This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: I46b3f12a661a406450d23a7974513f40beb23c8d
 2014-09-24 14:08:05 -07:00
Adrian Roos
ed59530269 am c45bfc9a: am 6d5c75f6: Prevent saving credentials multiple times 
* commit 'c45bfc9a3cb46af2fadd8e400d8a691108b94be1':
  Prevent saving credentials multiple times
 2014-09-24 17:24:14 +00:00
Adrian Roos
c45bfc9a3c am 6d5c75f6: Prevent saving credentials multiple times 
* commit '6d5c75f6cd928befb348fa283e53edc10716f151':
  Prevent saving credentials multiple times
 2014-09-24 17:11:42 +00:00
Adrian Roos
6d5c75f6cd Prevent saving credentials multiple times 
Bug: 17610563
Change-Id: Ibb51889fc8085f8fad5e36481af2419576cda34a
 2014-09-24 15:28:12 +02:00
Alexandra Gherghina
7f279cef11 Add null check for sync authorities of an account type 
This protects against a potential NPE if there are no sync authorities for
an account of a given type.

Bug: 17612697
Change-Id: Ifd34b5b7692cbcc8de78d353eedd284e499f954e
 2014-09-24 12:33:39 +01:00
Zoltan Szatmary-Ban
d50c7a8878 Start PowerUsageDetails fragment in the correct activity 
Make sure the stack does not get corrupted by running a fragment as a
managed profile in an activity that runs as primary profile.

Bug:17523189

Change-Id: I7a066a411c7995ffe44b73c6dc27b24eec85b5b3
 2014-09-24 12:33:33 +01:00
Alan Viverette
e4031966eb am 6f6e547e: am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev 
* commit '6f6e547e6ad93eb21599e721526909273e6d4fef':
  Fix background colors to point directly to theme attribute
 2014-09-24 03:29:41 +00:00
Fabrice Di Meglio
d1f7063532 am b749fd3d: am a1c6a0c8: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev 
* commit 'b749fd3d298c72b3377a6bcfd081d3739f40bcf9':
  Fix bug #17594602 Battery Usage refresh icon needs updating
 2014-09-24 03:24:58 +00:00
Alan Viverette
6f6e547e6a am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev 
* commit '3156e38f5ec788048439a401ea5f5012e11ea2a7':
  Fix background colors to point directly to theme attribute
 2014-09-24 01:34:44 +00:00
Alan Viverette
3156e38f5e Merge "Fix background colors to point directly to theme attribute" into lmp-dev 2014-09-24 01:25:07 +00:00
Alan Viverette
f81f72ffed Fix background colors to point directly to theme attribute 
BUG: 17520824
Change-Id: I77fcbc2a5535f4916053cf1668cbe2e432b2dc95
 2014-09-23 18:14:54 -07:00
Fabrice Di Meglio
b749fd3d29 am a1c6a0c8: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev 
* commit 'a1c6a0c895f6d580bebfb714c7930f5ec015770d':
  Fix bug #17594602 Battery Usage refresh icon needs updating
 2014-09-24 00:05:54 +00:00
Fabrice Di Meglio
a1c6a0c895 Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev 2014-09-23 23:58:59 +00:00
Fabrice Di Meglio
6a5ebf5fef Fix bug #17594602 Battery Usage refresh icon needs updating 
- use the correct Framework asset for "refresh"

Change-Id: I57d55c0646fb3a8693cf5cc51a4c7fa213873385
 2014-09-23 16:17:00 -07:00
vandwalle
333f5b8576 am 0b5aedc2: am 3962f171: Merge "correctly report DHCP failures" into lmp-dev 
* commit '0b5aedc2c560be1af7344e9a7ecacd85ab2cd0c0':
  correctly report DHCP failures
 2014-09-23 22:57:59 +00:00
vandwalle
0b5aedc2c5 am 3962f171: Merge "correctly report DHCP failures" into lmp-dev 
* commit '3962f171a9a44adea57618c5ac9bf4a47342c0b6':
  correctly report DHCP failures
 2014-09-23 22:41:31 +00:00
vandwalle
3962f171a9 Merge "correctly report DHCP failures" into lmp-dev 2014-09-23 22:31:56 +00:00
Fabrice Di Meglio
615a9f68fb am 8a966a45: am 575a4d2a: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev 
* commit '8a966a452d4ce8b2251a6e9607c64ab56a5d3d1e':
  Fix bug #17624121 Settings crash while launching on wiped device
 2014-09-23 20:38:12 +00:00
Fabrice Di Meglio
8a966a452d am 575a4d2a: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev 
* commit '575a4d2a19e0d3e3b052c936ce973d30c8b63be6':
  Fix bug #17624121 Settings crash while launching on wiped device
 2014-09-23 20:27:19 +00:00