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
Fabrice Di Meglio
575a4d2a19
Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev
2014-09-23 20:16:22 +00:00
vandwalle
fb075455bd
correctly report DHCP failures
...
Change-Id: I7a77da83dfb91d42ae18c54ae369ee8756e8f4d6
2014-09-23 13:04:09 -07:00
Fabrice Di Meglio
b3c7a179b1
Fix bug #17624121 Settings crash while launching on wiped device
...
- check for non null reference returned by NfcAdapter.getDefaultAdapter(this)
Change-Id: I88776dbefd351ce1c77cfed6d14b8b2143294488
2014-09-23 11:36:44 -07:00
Zoltan Szatmary-Ban
9b521f8519
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
2014-09-23 17:22:58 +01:00
PauloftheWest
c501efb09a
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.
2014-09-23 15:53:23 +00:00
John Spurlock
2c383942b3
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.
2014-09-23 15:48:31 +00:00
PauloftheWest
b28cfb2001
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.
2014-09-23 13:27:37 +00:00
PauloftheWest
7f397ef5cc
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.
2014-09-23 13:16:16 +00:00
PauloftheWest
a205445be2
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.
2014-09-23 13:05:53 +00:00
PauloftheWest
3b04714bdf
Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev
2014-09-23 13:00:02 +00:00
Michael Wright
29aaa20442
If a device identifier is specified, bring up keyboard layouts dialog.
...
Bug: 17614683
Change-Id: I0c25033d05d482ba45f17b3141b0a8673d0ff4b5
2014-09-22 20:09:56 -07:00
PauloftheWest
4da0e819ee
Fixed a Settings crash when exiting Wi-Fi Settings.
...
Bug: 17600287
Change-Id: Id2d35e450798785db8e485972036483946f67ef3
2014-09-22 15:12:13 -07:00
John Spurlock
a7fb5fbc7b
am 7d085d6d
: am 65a7bc64
: am 7e905488
: Settings: Wire up new zen events config option.
...
* commit '7d085d6de5c8a75afe4d68bc91cc9e1e3a4bc483':
Settings: Wire up new zen events config option.
2014-09-22 21:44:22 +00:00
John Spurlock
7d085d6de5
am 65a7bc64
: am 7e905488
: Settings: Wire up new zen events config option.
...
* commit '65a7bc6449c598cb5ea10e0899f1885339563424':
Settings: Wire up new zen events config option.
2014-09-22 21:32:28 +00:00
John Spurlock
65a7bc6449
am 7e905488
: Settings: Wire up new zen events config option.
...
* commit '7e90548836b3e7c4ec8132d9965ba11f055f6931':
Settings: Wire up new zen events config option.
2014-09-22 21:21:04 +00:00
John Spurlock
7e90548836
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
2014-09-22 16:45:06 -04:00
Baligh Uddin
76fbe05a6e
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
2014-09-22 20:01:03 +00:00
Baligh Uddin
a8b14e8392
am 19a41682
: (-s ours) am 165e3db3
: (-s ours) am b4d0d4da
: (-s ours) Import translations. DO NOT MERGE
...
* commit '19a416826d73ea4ec1cd26ac61a2b9d074714065':
Import translations. DO NOT MERGE
2014-09-22 20:01:02 +00:00
Baligh Uddin
349a3eff41
am 667eb931
: (-s ours) am f3bea4dd
: (-s ours) am 2bfd4a5f
: (-s ours) Import translations. DO NOT MERGE
...
* commit '667eb931552d6cafeb26f064655f8c4f4ebf09f7':
Import translations. DO NOT MERGE
2014-09-22 19:38:18 +00:00
Baligh Uddin
19a416826d
am 165e3db3
: (-s ours) am b4d0d4da
: (-s ours) Import translations. DO NOT MERGE
...
* commit '165e3db3366290c1397ea753c69f46d6730cd4bc':
Import translations. DO NOT MERGE
2014-09-22 19:38:16 +00:00
Baligh Uddin
667eb93155
am f3bea4dd
: (-s ours) am 2bfd4a5f
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f3bea4ddd76485014626d7997a0ecbcc5f36217c':
Import translations. DO NOT MERGE
2014-09-22 19:18:38 +00:00
Baligh Uddin
165e3db336
am b4d0d4da
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b4d0d4da2e6a2d0fa28b6471b088eeabc80b8f5f':
Import translations. DO NOT MERGE
2014-09-22 19:18:30 +00:00
Baligh Uddin
50a3d40558
am 3e8cec75
: (-s ours) am 9ca34e9a
: (-s ours) Import translations. DO NOT MERGE
...
* commit '3e8cec75288a91a566f4957e33122223877a7011':
Import translations. DO NOT MERGE
2014-09-21 18:30:27 +00:00
Baligh Uddin
3e8cec7528
am 9ca34e9a
: (-s ours) Import translations. DO NOT MERGE
...
* commit '9ca34e9ad63271958d453d5126ce6edf0e501483':
Import translations. DO NOT MERGE
2014-09-21 18:19:46 +00:00
Baligh Uddin
f3bea4ddd7
am 2bfd4a5f
: (-s ours) Import translations. DO NOT MERGE
...
* commit '2bfd4a5f2cb7e92331f9a4f44f1b70105cc2cb79':
Import translations. DO NOT MERGE
2014-09-21 18:19:31 +00:00
Baligh Uddin
c815ddc217
am 9d4f29d2
: (-s ours) Import translations. DO NOT MERGE
...
* commit '9d4f29d207fb147dbc16fd0fadc4ed5edc08abd3':
Import translations. DO NOT MERGE
2014-09-21 18:16:51 +00:00
Baligh Uddin
b4d0d4da2e
Import translations. DO NOT MERGE
...
Change-Id: Ic065056673757eb2cc68d1102d5e480418e7cc47
Auto-generated-cl: translation import
2014-09-20 23:34:37 -07:00
Baligh Uddin
9d4f29d207
Import translations. DO NOT MERGE
...
Change-Id: I318c0e8a24903330e142059ab9d41b2dd13e39d1
Auto-generated-cl: translation import
2014-09-20 23:31:22 -07:00
Baligh Uddin
9ca34e9ad6
Import translations. DO NOT MERGE
...
Change-Id: I03201beb1e3307a852bef4cdae23e6d313588e0b
Auto-generated-cl: translation import
2014-09-20 23:28:12 -07:00
Baligh Uddin
2bfd4a5f2c
Import translations. DO NOT MERGE
...
Change-Id: I628b5768f52d634b8ce2a08b1fee5f07de7a8b68
Auto-generated-cl: translation import
2014-09-20 23:24:41 -07:00
PauloftheWest
c8648718db
am 934af544
: am 04301e3d
: am 3845f270
: am 27dcfbbd
: Merge "Fixed a Bluetooth discovery bug." into lmp-dev
...
* commit '934af5444c6957ab476098bf3fb95789942ed51f':
Fixed a Bluetooth discovery bug.
2014-09-20 00:27:33 +00:00
PauloftheWest
a0f49568b6
am f5f3596c
: am e9a8b3df
: am 1f604d5b
: am 1977342e
: Merge "Fixed Settings Cellular Networks crash." into lmp-dev
...
* commit 'f5f3596c89149013dcc565dbf6d19514faf240b3':
Fixed Settings Cellular Networks crash.
2014-09-20 00:27:32 +00:00
PauloftheWest
934af5444c
am 04301e3d
: am 3845f270
: am 27dcfbbd
: Merge "Fixed a Bluetooth discovery bug." into lmp-dev
...
* commit '04301e3d9b1b8dc0b21b97d01856474fa10990d5':
Fixed a Bluetooth discovery bug.
2014-09-20 00:13:33 +00:00
PauloftheWest
f5f3596c89
am e9a8b3df
: am 1f604d5b
: am 1977342e
: Merge "Fixed Settings Cellular Networks crash." into lmp-dev
...
* commit 'e9a8b3df7d9050517b29aa7bb57f92adc833ea7b':
Fixed Settings Cellular Networks crash.
2014-09-20 00:13:32 +00:00
PauloftheWest
04301e3d9b
am 3845f270
: am 27dcfbbd
: Merge "Fixed a Bluetooth discovery bug." into lmp-dev
...
* commit '3845f270ff1c51611cc14b524878ae6c83e41590':
Fixed a Bluetooth discovery bug.
2014-09-20 00:00:54 +00:00
PauloftheWest
e9a8b3df7d
am 1f604d5b
: am 1977342e
: Merge "Fixed Settings Cellular Networks crash." into lmp-dev
...
* commit '1f604d5b83475011bc9ee3dba24d7bad900466d9':
Fixed Settings Cellular Networks crash.
2014-09-20 00:00:53 +00:00
PauloftheWest
3845f270ff
am 27dcfbbd
: Merge "Fixed a Bluetooth discovery bug." into lmp-dev
...
* commit '27dcfbbd893cb5a65fa27ac6b968559e22bf59e4':
Fixed a Bluetooth discovery bug.
2014-09-19 23:53:09 +00:00
PauloftheWest
1f604d5b83
am 1977342e
: Merge "Fixed Settings Cellular Networks crash." into lmp-dev
...
* commit '1977342e43a921005e40d213bef3fe66b0bbefbc':
Fixed Settings Cellular Networks crash.
2014-09-19 23:53:08 +00:00
PauloftheWest
27dcfbbd89
Merge "Fixed a Bluetooth discovery bug." into lmp-dev
2014-09-19 23:45:25 +00:00
PauloftheWest
1977342e43
Merge "Fixed Settings Cellular Networks crash." into lmp-dev
2014-09-19 23:44:01 +00:00
Baligh Uddin
e8362a99cf
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
2014-09-19 23:17:54 +00:00
Baligh Uddin
7c4b3c1333
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
2014-09-19 23:09:08 +00:00
Baligh Uddin
e9f87a458b
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
2014-09-19 22:59:53 +00:00
Baligh Uddin
026cbba1f2
am 4e3f5709
: (-s ours) am f015d47c
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '4e3f5709ad0892d3c8ffe6cbb620000ffe21f640':
Import translations. DO NOT MERGE
2014-09-19 22:56:52 +00:00
Baligh Uddin
a19608235d
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
2014-09-19 22:49:37 +00:00
Baligh Uddin
4e3f5709ad
am f015d47c
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'f015d47cf526b2bc6061f8d10dd28b82df1da4ab':
Import translations. DO NOT MERGE
2014-09-19 22:46:30 +00:00
Baligh Uddin
30032b95d8
am ae7c180a
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'ae7c180ad763d7b477c0e5ca5ec9d2c908f440cd':
Import translations. DO NOT MERGE
2014-09-19 22:44:01 +00:00
Baligh Uddin
f015d47cf5
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-19 22:34:18 +00:00