OSDN Git Service
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.
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.
PauloftheWest [Fri, 26 Sep 2014 14:47:27 +0000 (14:47 +0000)]
Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
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.
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.
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
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
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
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
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
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.
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
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
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
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.
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
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
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
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
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
Jeff Sharkey [Wed, 24 Sep 2014 23:28:00 +0000 (23:28 +0000)]
Merge "Include reason when wiping data." into lmp-dev
Paul Lawrence [Wed, 24 Sep 2014 22:59:07 +0000 (22:59 +0000)]
Merge "Hide controls once password is known good" into lmp-dev
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
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
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
Adrian Roos [Wed, 24 Sep 2014 13:28:12 +0000 (15:28 +0200)]
Prevent saving credentials multiple times
Bug:
17610563
Change-Id: Ibb51889fc8085f8fad5e36481af2419576cda34a
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
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
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
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
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
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
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
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
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
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
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
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
vandwalle [Tue, 23 Sep 2014 22:31:55 +0000 (22:31 +0000)]
Merge "correctly report DHCP failures" into lmp-dev
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
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
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
vandwalle [Thu, 18 Sep 2014 22:39:23 +0000 (15:39 -0700)]
correctly report DHCP failures
Change-Id: I7a77da83dfb91d42ae18c54ae369ee8756e8f4d6
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
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
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.
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.
PauloftheWest [Tue, 23 Sep 2014 13:00:01 +0000 (13:00 +0000)]
Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev
Michael Wright [Tue, 23 Sep 2014 02:46:24 +0000 (19:46 -0700)]
If a device identifier is specified, bring up keyboard layouts dialog.
Bug:
17614683
Change-Id: I0c25033d05d482ba45f17b3141b0a8673d0ff4b5
PauloftheWest [Mon, 22 Sep 2014 16:26:05 +0000 (09:26 -0700)]
Fixed a Settings crash when exiting Wi-Fi Settings.
Bug:
17600287
Change-Id: Id2d35e450798785db8e485972036483946f67ef3
John Spurlock [Mon, 22 Sep 2014 21:32:28 +0000 (21:32 +0000)]
am
65a7bc64: am
7e905488: Settings: Wire up new zen events config option.
* commit '
65a7bc6449c598cb5ea10e0899f1885339563424':
Settings: Wire up new zen events config option.
John Spurlock [Mon, 22 Sep 2014 21:21:04 +0000 (21:21 +0000)]
am
7e905488: Settings: Wire up new zen events config option.
* commit '
7e90548836b3e7c4ec8132d9965ba11f055f6931':
Settings: Wire up new zen events config option.
John Spurlock [Fri, 19 Sep 2014 19:31:12 +0000 (15:31 -0400)]
Settings: Wire up new zen events config option.
Add a new switch to zen mode settings for the new
events config attribute.
Depends on frameworks/base:
Iff10df385206ad73c3423ff118c79e94a10918d9
Bug:
17580878
Change-Id: Ib6c74a871aa02f9379dce58dd5bca817dcd3929a
Baligh Uddin [Mon, 22 Sep 2014 19:18:38 +0000 (19:18 +0000)]
am
f3bea4dd: (-s ours) am
2bfd4a5f: (-s ours) Import translations. DO NOT MERGE
* commit '
f3bea4ddd76485014626d7997a0ecbcc5f36217c':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Sep 2014 19:18:30 +0000 (19:18 +0000)]
am
b4d0d4da: (-s ours) Import translations. DO NOT MERGE
* commit '
b4d0d4da2e6a2d0fa28b6471b088eeabc80b8f5f':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 21 Sep 2014 18:19:31 +0000 (18:19 +0000)]
am
2bfd4a5f: (-s ours) Import translations. DO NOT MERGE
* commit '
2bfd4a5f2cb7e92331f9a4f44f1b70105cc2cb79':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 21 Sep 2014 06:34:37 +0000 (23:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic065056673757eb2cc68d1102d5e480418e7cc47
Auto-generated-cl: translation import
Baligh Uddin [Sun, 21 Sep 2014 06:28:12 +0000 (23:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I03201beb1e3307a852bef4cdae23e6d313588e0b
Auto-generated-cl: translation import
Baligh Uddin [Sun, 21 Sep 2014 06:24:41 +0000 (23:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I628b5768f52d634b8ce2a08b1fee5f07de7a8b68
Auto-generated-cl: translation import
PauloftheWest [Sat, 20 Sep 2014 00:00:54 +0000 (00:00 +0000)]
am
3845f270: am
27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev
* commit '
3845f270ff1c51611cc14b524878ae6c83e41590':
Fixed a Bluetooth discovery bug.
PauloftheWest [Sat, 20 Sep 2014 00:00:53 +0000 (00:00 +0000)]
am
1f604d5b: am
1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev
* commit '
1f604d5b83475011bc9ee3dba24d7bad900466d9':
Fixed Settings Cellular Networks crash.
PauloftheWest [Fri, 19 Sep 2014 23:53:09 +0000 (23:53 +0000)]
am
27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev
* commit '
27dcfbbd893cb5a65fa27ac6b968559e22bf59e4':
Fixed a Bluetooth discovery bug.
PauloftheWest [Fri, 19 Sep 2014 23:53:08 +0000 (23:53 +0000)]
am
1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev
* commit '
1977342e43a921005e40d213bef3fe66b0bbefbc':
Fixed Settings Cellular Networks crash.
PauloftheWest [Fri, 19 Sep 2014 23:45:24 +0000 (23:45 +0000)]
Merge "Fixed a Bluetooth discovery bug." into lmp-dev
PauloftheWest [Fri, 19 Sep 2014 23:44:01 +0000 (23:44 +0000)]
Merge "Fixed Settings Cellular Networks crash." into lmp-dev
Baligh Uddin [Fri, 19 Sep 2014 22:56:52 +0000 (22:56 +0000)]
am
4e3f5709: (-s ours) am
f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
4e3f5709ad0892d3c8ffe6cbb620000ffe21f640':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 19 Sep 2014 22:46:30 +0000 (22:46 +0000)]
am
f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
f015d47cf526b2bc6061f8d10dd28b82df1da4ab':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 19 Sep 2014 22:44:01 +0000 (22:44 +0000)]
am
ae7c180a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
ae7c180ad763d7b477c0e5ca5ec9d2c908f440cd':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 19 Sep 2014 22:34:17 +0000 (22:34 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Fri, 19 Sep 2014 22:34:16 +0000 (22:34 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Svetoslav [Fri, 19 Sep 2014 22:00:59 +0000 (22:00 +0000)]
am
abcf0302: am
1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev
* commit '
abcf0302e4351089322debf3739ac169ec299a5a':
Crash in Settings cancelling a print job from the job list.
Svetoslav [Fri, 19 Sep 2014 21:49:18 +0000 (21:49 +0000)]
am
1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev
* commit '
1154caa834d1fb502e9f80a509683faaf9b16a7f':
Crash in Settings cancelling a print job from the job list.
Svetoslav [Fri, 19 Sep 2014 21:41:56 +0000 (21:41 +0000)]
Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev
Svetoslav [Fri, 19 Sep 2014 21:15:48 +0000 (14:15 -0700)]
Crash in Settings cancelling a print job from the job list.
bug:
17585582
Change-Id: I44aef7e09c26141388b410762e93164d8df9a0c6
PauloftheWest [Fri, 19 Sep 2014 19:39:28 +0000 (12:39 -0700)]
Fixed a Bluetooth discovery bug.
+ Now when a user goes to Settings->Bluetooth and turns on Bluetooth,
the device will be discoverable.
Bug:
17368189
Change-Id: Ia0d8000ddf7e3c3b43172c08ee28e7305d205462
Vinit Deshpande [Fri, 19 Sep 2014 18:37:05 +0000 (18:37 +0000)]
am
22592afd: am
9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev
* commit '
22592afdd5d35618ddd5f8662994d8c15cf43d3f':
Fix automatic Wi-fi toggle
Vinit Deshpande [Fri, 19 Sep 2014 18:29:45 +0000 (18:29 +0000)]
am
9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev
* commit '
9a8c58d49dd84a45f216349fd4cbc2dacfdac9fe':
Fix automatic Wi-fi toggle
Vinit Deshpande [Fri, 19 Sep 2014 18:21:57 +0000 (18:21 +0000)]
Merge "Fix automatic Wi-fi toggle" into lmp-dev
PauloftheWest [Thu, 18 Sep 2014 17:12:25 +0000 (10:12 -0700)]
Fixed Settings Cellular Networks crash.
+ Removed the Cellular Networks option from Data Usage when the user is not
the phone owner.
Bug:
17529931
Change-Id: Ice89b8fb1e6d41fe71235af0beaa1ee3653f8cf8
Zoltan Szatmary-Ban [Fri, 19 Sep 2014 10:49:08 +0000 (10:49 +0000)]
am
28277ee9: am
6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev
* commit '
28277ee9fa51cd039e83fd6a87fe60fefb07158a':
Show Power usage details for the correct user
Zoltan Szatmary-Ban [Fri, 19 Sep 2014 10:38:17 +0000 (10:38 +0000)]
am
6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev
* commit '
6e1d8277e6c6443ad286bf25a7decb4f5a9b0cdf':
Show Power usage details for the correct user
Zoltan Szatmary-Ban [Fri, 19 Sep 2014 10:27:46 +0000 (10:27 +0000)]
Merge "Show Power usage details for the correct user" into lmp-dev
Matthew Xie [Fri, 19 Sep 2014 00:43:55 +0000 (00:43 +0000)]
am
a93c4cae: am
72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev
* commit '
a93c4cae6df26926a8e8b054135c40c71f147226':
Do not overwrite alias with device name
Matthew Xie [Fri, 19 Sep 2014 00:31:59 +0000 (00:31 +0000)]
am
72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev
* commit '
72c34e6a956a54ed023d207b41f5d21365b15c38':
Do not overwrite alias with device name
Matthew Xie [Fri, 19 Sep 2014 00:23:34 +0000 (00:23 +0000)]
Merge "Do not overwrite alias with device name" into lmp-dev
Matthew Xie [Thu, 18 Sep 2014 05:43:49 +0000 (22:43 -0700)]
Do not overwrite alias with device name
Bug:
17287682
Change-Id: Iea29e85125ae4720fd99f893f516c301b7aed7c6
Paul Lawrence [Thu, 18 Sep 2014 18:23:40 +0000 (11:23 -0700)]
Hide controls once password is known good
Bug:
17551103
Change-Id: I4fd182b7ac7a9ad7c1483979d4510b50b52e520f
PauloftheWest [Thu, 18 Sep 2014 16:11:54 +0000 (16:11 +0000)]
am
f6526146: am
0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '
f6526146250ff68df0f8941fe0b91ae74d55ab8d':
Removed an extraneous messge when pairing.
PauloftheWest [Thu, 18 Sep 2014 16:01:15 +0000 (16:01 +0000)]
am
0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '
0f01eeff84ebdb93f24398d3adb5f214ae1ce2bb':
Removed an extraneous messge when pairing.
PauloftheWest [Thu, 18 Sep 2014 15:51:49 +0000 (15:51 +0000)]
Merge "Removed an extraneous messge when pairing." into lmp-dev
Sander Alewijnse [Thu, 18 Sep 2014 11:55:46 +0000 (11:55 +0000)]
am
b997bd50: am
4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
* commit '
b997bd50ec5962842c50b1fdf4a50995e7b2a251':
Update targetSdkVersion check.
Sander Alewijnse [Thu, 18 Sep 2014 11:45:44 +0000 (11:45 +0000)]
am
4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
* commit '
4241b0a9627e424adb897ec894a34ddce8fd77e3':
Update targetSdkVersion check.
Sander Alewijnse [Thu, 18 Sep 2014 11:36:30 +0000 (11:36 +0000)]
Merge "Update targetSdkVersion check." into lmp-dev
Zoltan Szatmary-Ban [Thu, 18 Sep 2014 09:26:11 +0000 (10:26 +0100)]
Show Power usage details for the correct user
Settings > Battery > Details has to observe managed profiles and start the
Power Usage Detail fragment for the correct profile.
Bug:
17523189
Change-Id: I7a47b972a8a0492b4a411197cd2c8c65f24c2e7e
Mark Salyzyn [Wed, 17 Sep 2014 23:32:00 +0000 (23:32 +0000)]
am
66718d5a: am
894af268: logd: settings: ro.config.low_ram support
* commit '
66718d5a6e51d58a83b186bdd2cc1b6665d0020c':
logd: settings: ro.config.low_ram support
Mark Salyzyn [Wed, 17 Sep 2014 23:25:54 +0000 (23:25 +0000)]
am
894af268: logd: settings: ro.config.low_ram support
* commit '
894af268def8a817306ea83f21cb25b6f0edf2e3':
logd: settings: ro.config.low_ram support
Mark Salyzyn [Wed, 17 Sep 2014 21:05:15 +0000 (14:05 -0700)]
logd: settings: ro.config.low_ram support
- limit settings to 64K, 256K and 1M if ro.config.low_ram true
- Correctly handle ro.logd.size
Bug:
17526187
Change-Id: I2380b649516b29c2a98f54de18e5a4780b3421ce
PauloftheWest [Tue, 16 Sep 2014 19:29:17 +0000 (12:29 -0700)]
Removed an extraneous messge when pairing.
+ When two devices are executing Bluetooth simply pairing, which does
not need keyboard input, the message "Type the pairing code then press
Return or Enter." has been removed.
+ Note that in legacy pairing the message to type in the pairing key
should remain even if the user is only verifying the key. The reason is
that we are not able to guarantee the other device does not have to input
the key.
+ Also updated pin entry to Material/Quantum specification.
Bug:
17400402
Change-Id: I7853fa13835f7f60d0e71102de9a079708f3544e
Amith Yamasani [Wed, 17 Sep 2014 20:27:03 +0000 (20:27 +0000)]
am
80a1ced5: am
69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
* commit '
80a1ced5b22a24e472c4c465c8fcb8dca7a74da8':
Don't allow creating a guest from a secondary user...
Amith Yamasani [Wed, 17 Sep 2014 20:16:44 +0000 (20:16 +0000)]
am
69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
* commit '
69b674656af869219189fe0f7985c011d29d9b7e':
Don't allow creating a guest from a secondary user...