Commit Graph

16950 Commits

Author SHA1 Message Date
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
34f78835b9 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:51 +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
87fdccdc57 am f1a24609: am 7e905488: Settings: Wire up new zen events config option.
* commit 'f1a2460992ca95886e4c938b18129ff707261b3f':
  Settings: Wire up new zen events config option.
2014-09-22 21:32:18 +00:00
John Spurlock
f1a2460992 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:31 +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
f6cb6bab0b am acbd8195: (-s ours) am 2bfd4a5f: (-s ours) Import translations. DO NOT MERGE
* commit 'acbd8195002b4f5315f5de907149c2084626e28b':
  Import translations. DO NOT MERGE
2014-09-21 18:30:33 +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
acbd819500 am 2bfd4a5f: (-s ours) Import translations. DO NOT MERGE
* commit '2bfd4a5f2cb7e92331f9a4f44f1b70105cc2cb79':
  Import translations. DO NOT MERGE
2014-09-21 18:19:49 +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
6ff1b3d37b am c43b84e3: am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev
* commit 'c43b84e39b11bc8a6bb89dc590cfc6ebd4f6cd6b':
  Fixed a Bluetooth discovery bug.
2014-09-20 00:02:17 +00:00
PauloftheWest
55d5d83f38 am 8f771c1f: am 1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev
* commit '8f771c1f990a40044b1f7c3abe2b724abcfc119b':
  Fixed Settings Cellular Networks crash.
2014-09-20 00:02:16 +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
c43b84e39b am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev
* commit '27dcfbbd893cb5a65fa27ac6b968559e22bf59e4':
  Fixed a Bluetooth discovery bug.
2014-09-19 23:51:46 +00:00
PauloftheWest
8f771c1f99 am 1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev
* commit '1977342e43a921005e40d213bef3fe66b0bbefbc':
  Fixed Settings Cellular Networks crash.
2014-09-19 23:51:45 +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
85c0622678 am 3cf09bfe: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '3cf09bfe98ce0d8ebeb3dbb10f3408d086155607':
  Import translations. DO NOT MERGE
2014-09-19 22:56:42 +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
3cf09bfe98 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:17 +00:00