PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,060 Commits 1 Branch 0 Tags
6e07d41a7e65c483bc3ba1e7beb40f73e7df3b45
Commit Graph

17060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
6e07d41a7e am 3708cce5: am e03d52be: am 6a662321: am 0c74ea6c: am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev 
* commit '3708cce50598bf5855178c1b7ed8dca58fd95452':
  Fixed a crash when rotating a WPS dialog.
 2014-09-29 19:44:12 +00:00
Sky Faber
ec4ba9b538 User wifi separation feature. 
-Enable forget button for all users.

Change-Id: Iab79db10107ab5dbeb469c12621a9a4916bd62c9
 2014-09-27 02:05:47 +00:00
Vinit Deshpande
d7d604056b Merge "Separate wifi AP added by applications." 2014-09-27 02:01:13 +00:00
Sky Faber
2d657e3629 Separate wifi AP added by applications. 
-Add permission to allow settings to modify all wifi APs
-Add option to show AP owners.

Change-Id: I12943563ef714c4287e13488578f020d136d006d
 2014-09-27 02:00:36 +00:00
PauloftheWest
3708cce505 am e03d52be: am 6a662321: am 0c74ea6c: am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev 
* commit 'e03d52beed9db5e965ecca19c59ab619760f86bb':
  Fixed a crash when rotating a WPS dialog.
 2014-09-26 21:52:41 +00:00
Michael Wright
47a8ad6181 am d26109e8: am 94a72da1: am 65c402ef: am 28a049a6: am 1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev 
* commit 'd26109e86fbce2a38eab3b656d1ce33dd3e72d70':
  If a device identifier is specified, bring up keyboard layouts dialog.
 2014-09-26 15:27:57 +00:00
PauloftheWest
e03d52beed am 6a662321: am 0c74ea6c: am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev 
* commit '6a6623215545a59a9cebb5f87cb0cb71a586ec6d':
  Fixed a crash when rotating a WPS dialog.
 2014-09-26 15:15:41 +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
d26109e86f am 94a72da1: am 65c402ef: am 28a049a6: am 1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev 
* commit '94a72da1316a3a7e2dd1b86943a3d9a186965dd0':
  If a device identifier is specified, bring up keyboard layouts dialog.
 2014-09-26 04:29:14 +00:00
Michael Wright
94a72da131 am 65c402ef: am 28a049a6: am 1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev 
* commit '65c402ef9a58bc94056cbff5a93405da06c575dd':
  If a device identifier is specified, bring up keyboard layouts dialog.
 2014-09-25 22:50:06 +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
9a884b3962 am 9892f72a: am cb4ec69c: am 8c6211b5: am 15f71b3f: am a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev 
* commit '9892f72a1477416478d025f9b37837505dd44b32':
  Make Force Stop button work for packages of managed profile
 2014-09-25 18:42:44 +00:00
Zoltan Szatmary-Ban
f4f2191739 am d1ce0ec8: am bfb2dd48: am 2a26ac58: am 6da3f84c: am 7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev 
* commit 'd1ce0ec8cd42671b2127ae207c2b491a884f29ce':
  Start PowerUsageDetails fragment in the correct activity
 2014-09-25 18:42:43 +00:00
Alexandra Gherghina
088e5f07ad am fe9fb062: am 9e9b5496: am 72cf0cf9: am 94e2341b: am eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev 
* commit 'fe9fb0625d7291d22fb84ac5a6db35d44024d2ae':
  Add null check for sync authorities of an account type
 2014-09-25 18:42:41 +00:00
Jeff Sharkey
1742c46ba8 am f3065166: am 390b0bae: am 8acdcf7a: am a522e9a8: am d642d1ab: Merge "Include reason when wiping data." into lmp-dev 
* commit 'f3065166021cd8b63422508d2d0ec9e2ac283c73':
  Include reason when wiping data.
 2014-09-25 18:42:38 +00:00
Zoltan Szatmary-Ban
9892f72a14 am cb4ec69c: am 8c6211b5: am 15f71b3f: am a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev 
* commit 'cb4ec69ccc3d372ee26028396fb8dd439c036d64':
  Make Force Stop button work for packages of managed profile
 2014-09-25 18:32:33 +00:00
Zoltan Szatmary-Ban
d1ce0ec8cd am bfb2dd48: am 2a26ac58: am 6da3f84c: am 7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev 
* commit 'bfb2dd48cbc049c225c2b56cbe4fbe5b8b8bd0b9':
  Start PowerUsageDetails fragment in the correct activity
 2014-09-25 18:32:32 +00:00
Alexandra Gherghina
fe9fb0625d am 9e9b5496: am 72cf0cf9: am 94e2341b: am eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev 
* commit '9e9b54961d8e59bd89505dc8f20b337995cc2fcc':
  Add null check for sync authorities of an account type
 2014-09-25 18:32:31 +00:00
Jeff Sharkey
f306516602 am 390b0bae: am 8acdcf7a: am a522e9a8: am d642d1ab: Merge "Include reason when wiping data." into lmp-dev 
* commit '390b0bae5ddc0cf400d09193fea06e02630d8a41':
  Include reason when wiping data.
 2014-09-25 18:32:30 +00:00
Zoltan Szatmary-Ban
cb4ec69ccc am 8c6211b5: am 15f71b3f: am a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev 
* commit '8c6211b56f2272e38031ca845afe5a11a5b1e8e6':
  Make Force Stop button work for packages of managed profile
 2014-09-25 16:57:52 +00:00
Zoltan Szatmary-Ban
bfb2dd48cb am 2a26ac58: am 6da3f84c: am 7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev 
* commit '2a26ac58f025ea510800053b97aa39bef16091fa':
  Start PowerUsageDetails fragment in the correct activity
 2014-09-25 16:57:51 +00:00
Alexandra Gherghina
9e9b54961d am 72cf0cf9: am 94e2341b: am eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev 
* commit '72cf0cf96d13054569f58109aaf6c0543af1d796':
  Add null check for sync authorities of an account type
 2014-09-25 16:57:50 +00:00
Jeff Sharkey
390b0bae5d am 8acdcf7a: am a522e9a8: am d642d1ab: Merge "Include reason when wiping data." into lmp-dev 
* commit '8acdcf7a522af8c4f21e1727ae82be516e34c113':
  Include reason when wiping data.
 2014-09-25 16:57:49 +00: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
Paul Lawrence
adeed27664 am d54a2e05: am 1bbaf081: am f295f01b: am 2c4de435: am 29df3796: Merge "Hide controls once password is known good" into lmp-dev 
* commit 'd54a2e0506de833b3461a649d217a478f4046b4d':
  Hide controls once password is known good
 2014-09-25 10:35:01 +00:00
Paul Lawrence
d54a2e0506 am 1bbaf081: am f295f01b: am 2c4de435: am 29df3796: Merge "Hide controls once password is known good" into lmp-dev 
* commit '1bbaf081363e04506896965192c1d316c2e22ab6':
  Hide controls once password is known good
 2014-09-25 10:24:13 +00:00
Paul Lawrence
1bbaf08136 am f295f01b: am 2c4de435: am 29df3796: Merge "Hide controls once password is known good" into lmp-dev 
* commit 'f295f01bcc7200d46d24893392ce9522ace3928c':
  Hide controls once password is known good
 2014-09-25 10:14:08 +00: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
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
2cd9f4c631 am b88b3ea8: am ec93c7b0: am ed595302: am c45bfc9a: am 6d5c75f6: Prevent saving credentials multiple times 
* commit 'b88b3ea88b490291c684ecc11c923032f4d755a9':
  Prevent saving credentials multiple times
 2014-09-24 17:56:35 +00:00
Adrian Roos
b88b3ea88b am ec93c7b0: am ed595302: am c45bfc9a: am 6d5c75f6: Prevent saving credentials multiple times 
* commit 'ec93c7b071ff36051a89e8ac339f4e76f3c9e26b':
  Prevent saving credentials multiple times
 2014-09-24 17:43:22 +00:00
Adrian Roos
ec93c7b071 am ed595302: am c45bfc9a: am 6d5c75f6: Prevent saving credentials multiple times 
* commit 'ed5953026910534857ffd7169b1e4da13f5b6588':
  Prevent saving credentials multiple times
 2014-09-24 17:36:58 +00:00