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

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

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

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

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

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

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

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: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

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

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: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

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

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

John Spurlock [Mon, 22 Sep 2014 21:44:22 +0000 (21:44 +0000)]

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

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Mon, 22 Sep 2014 20:01:03 +0000 (20:01 +0000)]

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

* commit '349a3eff415f1f3c19c4332bd3b7d8b80fa298a2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 22 Sep 2014 20:01:02 +0000 (20:01 +0000)]

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

* commit '19a416826d73ea4ec1cd26ac61a2b9d074714065':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 22 Sep 2014 19:38:18 +0000 (19:38 +0000)]

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

* commit '667eb931552d6cafeb26f064655f8c4f4ebf09f7':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 22 Sep 2014 19:38:16 +0000 (19:38 +0000)]

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

* commit '165e3db3366290c1397ea753c69f46d6730cd4bc':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 21 Sep 2014 18:30:27 +0000 (18:30 +0000)]

am 3e8cec75: (-s ours) am 9ca34e9a: (-s ours) Import translations. DO NOT MERGE

* commit '3e8cec75288a91a566f4957e33122223877a7011':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 21 Sep 2014 18:19:46 +0000 (18:19 +0000)]

am 9ca34e9a: (-s ours) Import translations. DO NOT MERGE

* commit '9ca34e9ad63271958d453d5126ce6edf0e501483':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 21 Sep 2014 18:16:51 +0000 (18:16 +0000)]

am 9d4f29d2: (-s ours) Import translations. DO NOT MERGE

* commit '9d4f29d207fb147dbc16fd0fadc4ed5edc08abd3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sun, 21 Sep 2014 06:31:22 +0000 (23:31 -0700)]

Import translations. DO NOT MERGE

Change-Id: I318c0e8a24903330e142059ab9d41b2dd13e39d1
Auto-generated-cl: translation import

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

PauloftheWest [Sat, 20 Sep 2014 00:27:33 +0000 (00:27 +0000)]

am 934af544: am 04301e3d: am 3845f270: am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev

* commit '934af5444c6957ab476098bf3fb95789942ed51f':
Fixed a Bluetooth discovery bug.

commit | commitdiff | tree

PauloftheWest [Sat, 20 Sep 2014 00:27:32 +0000 (00:27 +0000)]

am f5f3596c: am e9a8b3df: am 1f604d5b: am 1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev

* commit 'f5f3596c89149013dcc565dbf6d19514faf240b3':
Fixed Settings Cellular Networks crash.

commit | commitdiff | tree

PauloftheWest [Sat, 20 Sep 2014 00:13:33 +0000 (00:13 +0000)]

am 04301e3d: am 3845f270: am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev

* commit '04301e3d9b1b8dc0b21b97d01856474fa10990d5':
Fixed a Bluetooth discovery bug.

commit | commitdiff | tree

PauloftheWest [Sat, 20 Sep 2014 00:13:32 +0000 (00:13 +0000)]

am e9a8b3df: am 1f604d5b: am 1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev

* commit 'e9a8b3df7d9050517b29aa7bb57f92adc833ea7b':
Fixed Settings Cellular Networks crash.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 23:45:24 +0000 (23:45 +0000)]

Merge "Fixed a Bluetooth discovery bug." into lmp-dev

commit | commitdiff | tree

PauloftheWest [Fri, 19 Sep 2014 23:44:01 +0000 (23:44 +0000)]

Merge "Fixed Settings Cellular Networks crash." into lmp-dev

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 23:17:54 +0000 (23:17 +0000)]

am 7c4b3c13: (-s ours) am 026cbba1: (-s ours) am 4e3f5709: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '7c4b3c13330199f0494568b53e58a1f5669d54b4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 23:09:08 +0000 (23:09 +0000)]

am 026cbba1: (-s ours) am 4e3f5709: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '026cbba1f25bae341bd832edbebaa2c60e12c836':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:59:53 +0000 (22:59 +0000)]

am a1960823: (-s ours) am 30032b95: (-s ours) am ae7c180a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:49:37 +0000 (22:49 +0000)]

am 30032b95: (-s ours) am ae7c180a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '30032b95d815312c1fdfc4c75b616c18385cd990':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:34:17 +0000 (22:34 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-dev

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:34:16 +0000 (22:34 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

commit | commitdiff | tree

Svetoslav [Fri, 19 Sep 2014 22:20:10 +0000 (22:20 +0000)]

am 4b1a41c4: am d56668a7: am abcf0302: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev

* commit '4b1a41c4c657b704e65f7d515b91118feb109693':
Crash in Settings cancelling a print job from the job list.

commit | commitdiff | tree

Svetoslav [Fri, 19 Sep 2014 22:11:02 +0000 (22:11 +0000)]

am d56668a7: am abcf0302: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev

* commit 'd56668a7d13227780005fcffdcdbd75810cf926f':
Crash in Settings cancelling a print job from the job list.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Vinit Deshpande [Fri, 19 Sep 2014 18:58:46 +0000 (18:58 +0000)]

am cce30794: am 50234a19: am 22592afd: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev

* commit 'cce30794f06310c56024d80e45dcb5d8e7d4a4fa':
Fix automatic Wi-fi toggle

commit | commitdiff | tree

Vinit Deshpande [Fri, 19 Sep 2014 18:49:14 +0000 (18:49 +0000)]

am 50234a19: am 22592afd: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev

* commit '50234a19aa8d2a5b4b640bbe3cf4f6d735a8baee':
Fix automatic Wi-fi toggle

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Vinit Deshpande [Fri, 19 Sep 2014 18:21:57 +0000 (18:21 +0000)]

Merge "Fix automatic Wi-fi toggle" into lmp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 19 Sep 2014 13:26:57 +0000 (13:26 +0000)]

am dd320ec8: am 30b4aa9f: am 28277ee9: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev

* commit 'dd320ec86920d87a6bc38036ca3e9824272ffd2e':
Show Power usage details for the correct user

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 19 Sep 2014 11:00:19 +0000 (11:00 +0000)]

am 30b4aa9f: am 28277ee9: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev

* commit '30b4aa9f27e36a729f37e0c3bb3e7ebf45f851d1':
Show Power usage details for the correct user

commit | commitdiff | tree

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