git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Alexandra Gherghina [Mon, 29 Sep 2014 19:44:13 +0000 (19:44 +0000)]

am f458406f: am 294c32ce: am 5dab2fd3: am c7611429: am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev

* commit 'f458406f4046092bb71d164f57bf2b4b8b6e1564':
Use plain user icon in UserSpinnerAdapter

commit | commitdiff | tree

PauloftheWest [Mon, 29 Sep 2014 19:44:12 +0000 (19:44 +0000)]

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.

commit | commitdiff | tree

Sky Faber [Fri, 26 Sep 2014 21:26:23 +0000 (14:26 -0700)]

User wifi separation feature.

-Enable forget button for all users.

Change-Id: Iab79db10107ab5dbeb469c12621a9a4916bd62c9

commit | commitdiff | tree

Vinit Deshpande [Sat, 27 Sep 2014 02:01:13 +0000 (02:01 +0000)]

Merge "Separate wifi AP added by applications."

commit | commitdiff | tree

Sky Faber [Mon, 22 Sep 2014 23:43:04 +0000 (16:43 -0700)]

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

commit | commitdiff | tree

Alexandra Gherghina [Fri, 26 Sep 2014 21:52:42 +0000 (21:52 +0000)]

am 294c32ce: am 5dab2fd3: am c7611429: am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev

* commit '294c32ce458b9d53796387cd59ba1cab3cd592ce':
Use plain user icon in UserSpinnerAdapter

commit | commitdiff | tree

PauloftheWest [Fri, 26 Sep 2014 21:52:41 +0000 (21:52 +0000)]

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.

commit | commitdiff | tree

Alexandra Gherghina [Fri, 26 Sep 2014 20:45:59 +0000 (20:45 +0000)]

am 5dab2fd3: am c7611429: am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev

* commit '5dab2fd3b21f561fc5d5874566762ea88b260725':
Use plain user icon in UserSpinnerAdapter

commit | commitdiff | tree

Alexandra Gherghina [Fri, 26 Sep 2014 20:11:29 +0000 (20:11 +0000)]

am c7611429: am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev

* commit 'c7611429e906423c5f7ba9da80e40bb364c684b1':
Use plain user icon in UserSpinnerAdapter

commit | commitdiff | tree

Alexandra Gherghina [Fri, 26 Sep 2014 19:55:27 +0000 (19:55 +0000)]

am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev

* commit '3c3ceb9d42ddd8ee65547183b3685fd088a6676e':
Use plain user icon in UserSpinnerAdapter

commit | commitdiff | tree

Alexandra Gherghina [Fri, 26 Sep 2014 17:42:48 +0000 (17:42 +0000)]

Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev

commit | commitdiff | tree

Michael Wright [Fri, 26 Sep 2014 15:27:57 +0000 (15:27 +0000)]

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.

commit | commitdiff | tree

PauloftheWest [Fri, 26 Sep 2014 15:15:41 +0000 (15:15 +0000)]

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.

commit | commitdiff | tree

PauloftheWest [Fri, 26 Sep 2014 15:04:41 +0000 (15:04 +0000)]

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.

commit | commitdiff | tree

PauloftheWest [Fri, 26 Sep 2014 14:54:19 +0000 (14:54 +0000)]

am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev

* commit '3aabfca462af26c487d2a834f70d0998d7556637':
Fixed a crash when rotating a WPS dialog.

commit | commitdiff | tree

PauloftheWest [Fri, 26 Sep 2014 14:47:27 +0000 (14:47 +0000)]

Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev

commit | commitdiff | tree

Michael Wright [Fri, 26 Sep 2014 04:29:14 +0000 (04:29 +0000)]

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.

commit | commitdiff | tree

Michael Wright [Thu, 25 Sep 2014 22:50:06 +0000 (22:50 +0000)]

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.

commit | commitdiff | tree

Michael Wright [Thu, 25 Sep 2014 22:38:32 +0000 (22:38 +0000)]

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.

commit | commitdiff | tree

Michael Wright [Thu, 25 Sep 2014 22:26:59 +0000 (22:26 +0000)]

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.

commit | commitdiff | tree

Michael Wright [Thu, 25 Sep 2014 22:18:33 +0000 (22:18 +0000)]

Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev

commit | commitdiff | tree

PauloftheWest [Thu, 25 Sep 2014 19:36:09 +0000 (12:36 -0700)]

Fixed a crash when rotating a WPS dialog.

Bug: 17635632
Change-Id: Ibd4497362dc61a2f82c098889145430740207638

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 25 Sep 2014 18:42:44 +0000 (18:42 +0000)]

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 25 Sep 2014 18:42:43 +0000 (18:42 +0000)]

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

commit | commitdiff | tree

Alexandra Gherghina [Thu, 25 Sep 2014 18:42:41 +0000 (18:42 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 25 Sep 2014 18:42:38 +0000 (18:42 +0000)]

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.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 25 Sep 2014 18:32:33 +0000 (18:32 +0000)]

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 25 Sep 2014 18:32:32 +0000 (18:32 +0000)]

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

commit | commitdiff | tree

Alexandra Gherghina [Thu, 25 Sep 2014 18:32:31 +0000 (18:32 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 25 Sep 2014 18:32:30 +0000 (18:32 +0000)]

am 390b0bae: am 8acdcf7a: am a522e9a8: am d642d1ab: Merge "Include reason when wiping data." into lmp-dev

* commit '390b0bae5ddc0cf400d09193fea06e02630d8a41':
Include reason when wiping data.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:57:52 +0000 (16:57 +0000)]

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:57:51 +0000 (16:57 +0000)]

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

commit | commitdiff | tree

Alexandra Gherghina [Thu, 25 Sep 2014 16:57:50 +0000 (16:57 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 25 Sep 2014 16:57:49 +0000 (16:57 +0000)]

am 8acdcf7a: am a522e9a8: am d642d1ab: Merge "Include reason when wiping data." into lmp-dev

* commit '8acdcf7a522af8c4f21e1727ae82be516e34c113':
Include reason when wiping data.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:39:17 +0000 (16:39 +0000)]

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:39:16 +0000 (16:39 +0000)]

am 6da3f84c: am 7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev

* commit '6da3f84c9789378d701894a0a65be536da5e220c':
Start PowerUsageDetails fragment in the correct activity

commit | commitdiff | tree

Alexandra Gherghina [Thu, 25 Sep 2014 16:39:16 +0000 (16:39 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 25 Sep 2014 16:39:15 +0000 (16:39 +0000)]

am a522e9a8: am d642d1ab: Merge "Include reason when wiping data." into lmp-dev

* commit 'a522e9a83739446bf89d801f7ceac5f7effc3727':
Include reason when wiping data.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:24:18 +0000 (16:24 +0000)]

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 25 Sep 2014 16:24:17 +0000 (16:24 +0000)]

am 7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev

* commit '7258650efdea447dea6f2f557cb9d2b90df92754':
Start PowerUsageDetails fragment in the correct activity

commit | commitdiff | tree

Alexandra Gherghina [Thu, 25 Sep 2014 16:24:15 +0000 (16:24 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 25 Sep 2014 16:22:25 +0000 (16:22 +0000)]

am d642d1ab: Merge "Include reason when wiping data." into lmp-dev

* commit 'd642d1abcfed427e4c152e28e39b50cdb68b81c6':
Include reason when wiping data.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 25 Sep 2014 10:38:40 +0000 (10:38 +0000)]

Merge "Make Force Stop button work for packages of managed profile" into lmp-dev

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 25 Sep 2014 10:35:57 +0000 (10:35 +0000)]

Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev

commit | commitdiff | tree

Paul Lawrence [Thu, 25 Sep 2014 10:35:01 +0000 (10:35 +0000)]

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

commit | commitdiff | tree

Paul Lawrence [Thu, 25 Sep 2014 10:24:13 +0000 (10:24 +0000)]

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

commit | commitdiff | tree

Paul Lawrence [Thu, 25 Sep 2014 10:14:08 +0000 (10:14 +0000)]

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

commit | commitdiff | tree

Alexandra Gherghina [Mon, 22 Sep 2014 09:16:06 +0000 (10:16 +0100)]

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

commit | commitdiff | tree

Paul Lawrence [Thu, 25 Sep 2014 10:03:46 +0000 (10:03 +0000)]

am 2c4de435: am 29df3796: Merge "Hide controls once password is known good" into lmp-dev

* commit '2c4de435bf4dfb339fe7b36ab0f9ac93ed8120ce':
Hide controls once password is known good

commit | commitdiff | tree

Paul Lawrence [Thu, 25 Sep 2014 09:51:35 +0000 (09:51 +0000)]

am 29df3796: Merge "Hide controls once password is known good" into lmp-dev

* commit '29df37969794aa4db73af0d0fdbcde273aef5ab2':
Hide controls once password is known good

commit | commitdiff | tree

Alexandra Gherghina [Thu, 25 Sep 2014 09:37:57 +0000 (09:37 +0000)]

Merge "Add null check for sync authorities of an account type" into lmp-dev

commit | commitdiff | tree

Jeff Sharkey [Wed, 24 Sep 2014 23:28:00 +0000 (23:28 +0000)]

Merge "Include reason when wiping data." into lmp-dev

commit | commitdiff | tree

Paul Lawrence [Wed, 24 Sep 2014 22:59:07 +0000 (22:59 +0000)]

Merge "Hide controls once password is known good" into lmp-dev

commit | commitdiff | tree

Jeff Sharkey [Wed, 24 Sep 2014 20:57:07 +0000 (13:57 -0700)]

Include reason when wiping data.

This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: I46b3f12a661a406450d23a7974513f40beb23c8d

commit | commitdiff | tree

Adrian Roos [Wed, 24 Sep 2014 17:56:35 +0000 (17:56 +0000)]

am b88b3ea8: am ec93c7b0: am ed595302: am c45bfc9a: am 6d5c75f6: Prevent saving credentials multiple times

* commit 'b88b3ea88b490291c684ecc11c923032f4d755a9':
Prevent saving credentials multiple times

commit | commitdiff | tree

Adrian Roos [Wed, 24 Sep 2014 17:43:22 +0000 (17:43 +0000)]

am ec93c7b0: am ed595302: am c45bfc9a: am 6d5c75f6: Prevent saving credentials multiple times

* commit 'ec93c7b071ff36051a89e8ac339f4e76f3c9e26b':
Prevent saving credentials multiple times

commit | commitdiff | tree

Adrian Roos [Wed, 24 Sep 2014 17:36:58 +0000 (17:36 +0000)]

am ed595302: am c45bfc9a: am 6d5c75f6: Prevent saving credentials multiple times

* commit 'ed5953026910534857ffd7169b1e4da13f5b6588':
Prevent saving credentials multiple times

commit | commitdiff | tree

Adrian Roos [Wed, 24 Sep 2014 17:24:14 +0000 (17:24 +0000)]

am c45bfc9a: am 6d5c75f6: Prevent saving credentials multiple times

* commit 'c45bfc9a3cb46af2fadd8e400d8a691108b94be1':
Prevent saving credentials multiple times

commit | commitdiff | tree

Alan Viverette [Wed, 24 Sep 2014 17:17:06 +0000 (17:17 +0000)]

am f1f7af01: am 05df9029: am e4031966: am 6f6e547e: am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev

* commit 'f1f7af01deb8e5c2bfd102ed4455e2d3d59c8e72':
Fix background colors to point directly to theme attribute

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 24 Sep 2014 17:17:05 +0000 (17:17 +0000)]

am bd5d45a4: am 4f392ba8: am d1f70635: am b749fd3d: am a1c6a0c8: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev

* commit 'bd5d45a486c80b7ae2d543b8f0bb3d6f0c460451':
Fix bug #17594602 Battery Usage refresh icon needs updating

commit | commitdiff | tree

vandwalle [Wed, 24 Sep 2014 17:16:31 +0000 (17:16 +0000)]

am 92cc8dbb: am 6767666d: am 333f5b85: am 0b5aedc2: am 3962f171: Merge "correctly report DHCP failures" into lmp-dev

* commit '92cc8dbb739d5e396a1e2bcecead834f4966b5d6':
correctly report DHCP failures

commit | commitdiff | tree

Adrian Roos [Wed, 24 Sep 2014 17:11:42 +0000 (17:11 +0000)]

am 6d5c75f6: Prevent saving credentials multiple times

* commit '6d5c75f6cd928befb348fa283e53edc10716f151':
Prevent saving credentials multiple times

commit | commitdiff | tree

Adrian Roos [Wed, 24 Sep 2014 13:28:12 +0000 (15:28 +0200)]

Prevent saving credentials multiple times

Bug: 17610563
Change-Id: Ibb51889fc8085f8fad5e36481af2419576cda34a

commit | commitdiff | tree

Alexandra Gherghina [Wed, 24 Sep 2014 10:29:48 +0000 (11:29 +0100)]

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Mon, 22 Sep 2014 16:14:08 +0000 (17:14 +0100)]

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

commit | commitdiff | tree

Alan Viverette [Wed, 24 Sep 2014 04:13:11 +0000 (04:13 +0000)]

am 05df9029: am e4031966: am 6f6e547e: am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev

* commit '05df9029e951816888b06599dd7320de9362f038':
Fix background colors to point directly to theme attribute

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 24 Sep 2014 04:13:10 +0000 (04:13 +0000)]

am 4f392ba8: am d1f70635: am b749fd3d: am a1c6a0c8: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev

* commit '4f392ba82fd0a07ae3bb2662e2fa6253798dae6f':
Fix bug #17594602 Battery Usage refresh icon needs updating

commit | commitdiff | tree

Alan Viverette [Wed, 24 Sep 2014 03:57:42 +0000 (03:57 +0000)]

am e4031966: am 6f6e547e: am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev

* commit 'e4031966eb90c1b457bf92ca353676877b9ef8e2':
Fix background colors to point directly to theme attribute

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 24 Sep 2014 03:57:41 +0000 (03:57 +0000)]

am d1f70635: am b749fd3d: am a1c6a0c8: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev

* commit 'd1f7063532e004e235b98a719d619e1e68d5c7bf':
Fix bug #17594602 Battery Usage refresh icon needs updating

commit | commitdiff | tree

Alan Viverette [Wed, 24 Sep 2014 03:29:41 +0000 (03:29 +0000)]

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

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 24 Sep 2014 03:24:58 +0000 (03:24 +0000)]

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

commit | commitdiff | tree

Alan Viverette [Wed, 24 Sep 2014 01:34:44 +0000 (01:34 +0000)]

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

commit | commitdiff | tree

Alan Viverette [Wed, 24 Sep 2014 01:25:06 +0000 (01:25 +0000)]

Merge "Fix background colors to point directly to theme attribute" into lmp-dev

commit | commitdiff | tree

Alan Viverette [Wed, 24 Sep 2014 01:14:54 +0000 (18:14 -0700)]

Fix background colors to point directly to theme attribute

BUG: 17520824
Change-Id: I77fcbc2a5535f4916053cf1668cbe2e432b2dc95

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 24 Sep 2014 00:05:54 +0000 (00:05 +0000)]

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

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 23 Sep 2014 23:58:57 +0000 (23:58 +0000)]

Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev

commit | commitdiff | tree

vandwalle [Tue, 23 Sep 2014 23:18:20 +0000 (23:18 +0000)]

am 6767666d: am 333f5b85: am 0b5aedc2: am 3962f171: Merge "correctly report DHCP failures" into lmp-dev

* commit '6767666d25005cdd0ad4fb962b182fdf13a10848':
correctly report DHCP failures

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 23 Sep 2014 23:17:00 +0000 (16:17 -0700)]

Fix bug #17594602 Battery Usage refresh icon needs updating

- use the correct Framework asset for "refresh"

Change-Id: I57d55c0646fb3a8693cf5cc51a4c7fa213873385

commit | commitdiff | tree

vandwalle [Tue, 23 Sep 2014 23:05:58 +0000 (23:05 +0000)]

am 333f5b85: am 0b5aedc2: am 3962f171: Merge "correctly report DHCP failures" into lmp-dev

* commit '333f5b857666565ba89f6197fd253fd9c9c9b7da':
correctly report DHCP failures

commit | commitdiff | tree

vandwalle [Tue, 23 Sep 2014 22:57:59 +0000 (22:57 +0000)]

am 0b5aedc2: am 3962f171: Merge "correctly report DHCP failures" into lmp-dev

* commit '0b5aedc2c560be1af7344e9a7ecacd85ab2cd0c0':
correctly report DHCP failures

commit | commitdiff | tree

vandwalle [Tue, 23 Sep 2014 22:41:31 +0000 (22:41 +0000)]

am 3962f171: Merge "correctly report DHCP failures" into lmp-dev

* commit '3962f171a9a44adea57618c5ac9bf4a47342c0b6':
correctly report DHCP failures

commit | commitdiff | tree

vandwalle [Tue, 23 Sep 2014 22:31:55 +0000 (22:31 +0000)]

Merge "correctly report DHCP failures" into lmp-dev

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 23 Sep 2014 21:13:22 +0000 (21:13 +0000)]

am ef2a7137: am 6fd07d23: am 615a9f68: am 8a966a45: am 575a4d2a: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev

* commit 'ef2a7137d31631d80721c46a9f149868e7300de9':
Fix bug #17624121 Settings crash while launching on wiped device

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 23 Sep 2014 21:00:48 +0000 (21:00 +0000)]

am 6fd07d23: am 615a9f68: am 8a966a45: am 575a4d2a: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev

* commit '6fd07d2382d04e30a9120d024f83601174aa5b23':
Fix bug #17624121 Settings crash while launching on wiped device

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 23 Sep 2014 20:48:44 +0000 (20:48 +0000)]

am 615a9f68: am 8a966a45: am 575a4d2a: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev

* commit '615a9f68fb85f09944d7e98dc0e00ec7ed558712':
Fix bug #17624121 Settings crash while launching on wiped device

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 23 Sep 2014 20:38:12 +0000 (20:38 +0000)]

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

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 23 Sep 2014 20:27:19 +0000 (20:27 +0000)]

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

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 23 Sep 2014 20:16:22 +0000 (20:16 +0000)]

Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev

commit | commitdiff | tree

vandwalle [Thu, 18 Sep 2014 22:39:23 +0000 (15:39 -0700)]

correctly report DHCP failures

Change-Id: I7a77da83dfb91d42ae18c54ae369ee8756e8f4d6

commit | commitdiff | tree

PauloftheWest [Tue, 23 Sep 2014 19:06:44 +0000 (19:06 +0000)]

am c501efb0: am b28cfb20: am 7f397ef5: am a205445b: am 3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev

* commit 'c501efb09a0486f49e3c1b54967be7ca638c75a2':
Fixed a Settings crash when exiting Wi-Fi Settings.

commit | commitdiff | tree

John Spurlock [Tue, 23 Sep 2014 19:06:42 +0000 (19:06 +0000)]

am 2c383942: am a7fb5fbc: am 7d085d6d: am 65a7bc64: am 7e905488: Settings: Wire up new zen events config option.

* commit '2c383942b3fbda90e390cf8975fd3de32a0c007e':
Settings: Wire up new zen events config option.

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 23 Sep 2014 18:36:44 +0000 (11:36 -0700)]

Fix bug #17624121 Settings crash while launching on wiped device

- check for non null reference returned by NfcAdapter.getDefaultAdapter(this)

Change-Id: I88776dbefd351ce1c77cfed6d14b8b2143294488

commit | commitdiff | tree

Zoltan Szatmary-Ban [Tue, 23 Sep 2014 16:22:58 +0000 (17:22 +0100)]

Make Force Stop button work for packages of managed profile

Call force stop of a package for the correct profile.

Bug: 17580914
Change-Id: I7c601618f7819d6775cf422dca70a929ee1089d9

commit | commitdiff | tree

Baligh Uddin [Tue, 23 Sep 2014 16:17:52 +0000 (16:17 +0000)]

am 76fbe05a: (-s ours) am 349a3eff: (-s ours) am 667eb931: (-s ours) am f3bea4dd: (-s ours) am 2bfd4a5f: (-s ours) Import translations. DO NOT MERGE

* commit '76fbe05a6e8acd36775fc7798dc4528ce0dc1fea':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 23 Sep 2014 16:17:51 +0000 (16:17 +0000)]

am a8b14e83: (-s ours) am 19a41682: (-s ours) am 165e3db3: (-s ours) am b4d0d4da: (-s ours) Import translations. DO NOT MERGE

* commit 'a8b14e83925446a52635a97ff1df50c418cf332a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

PauloftheWest [Tue, 23 Sep 2014 15:53:23 +0000 (15:53 +0000)]

am b28cfb20: am 7f397ef5: am a205445b: am 3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev

* commit 'b28cfb2001182a99f6177e16ae241563159503b5':
Fixed a Settings crash when exiting Wi-Fi Settings.

commit | commitdiff | tree

John Spurlock [Tue, 23 Sep 2014 15:48:31 +0000 (15:48 +0000)]

am a7fb5fbc: am 7d085d6d: am 65a7bc64: am 7e905488: Settings: Wire up new zen events config option.

* commit 'a7fb5fbc7b35ba905d84362582bdf67d53ad5d40':
Settings: Wire up new zen events config option.

commit | commitdiff | tree

PauloftheWest [Tue, 23 Sep 2014 13:27:37 +0000 (13:27 +0000)]

am 7f397ef5: am a205445b: am 3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev

* commit '7f397ef5cc28f21680d0ed2872aeda14c70c6623':
Fixed a Settings crash when exiting Wi-Fi Settings.

commit | commitdiff | tree

PauloftheWest [Tue, 23 Sep 2014 13:16:16 +0000 (13:16 +0000)]

am a205445b: am 3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev

* commit 'a205445be28f4c0b0f972344c99d7158c1cc5c2e':
Fixed a Settings crash when exiting Wi-Fi Settings.

commit | commitdiff | tree

PauloftheWest [Tue, 23 Sep 2014 13:05:53 +0000 (13:05 +0000)]

am 3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev

* commit '3b04714bdf970eaad831edb3531253c87aced2bc':
Fixed a Settings crash when exiting Wi-Fi Settings.