Commit Graph

15720 Commits

Author SHA1 Message Date
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
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
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
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
b4d0d4da2e Import translations. DO NOT MERGE
Change-Id: Ic065056673757eb2cc68d1102d5e480418e7cc47
Auto-generated-cl: translation import
2014-09-20 23:34:37 -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
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
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
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
Baligh Uddin
ae7c180ad7 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-19 22:34:16 +00:00
Svetoslav
d56668a7d1 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.
2014-09-19 22:00:59 +00:00
Svetoslav
abcf0302e4 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.
2014-09-19 21:49:18 +00:00
Svetoslav
1154caa834 Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev 2014-09-19 21:41:56 +00:00
Svetoslav
43835e006e Crash in Settings cancelling a print job from the job list.
bug:17585582

Change-Id: I44aef7e09c26141388b410762e93164d8df9a0c6
2014-09-19 14:15:52 -07:00
PauloftheWest
9bab4ea695 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
2014-09-19 14:07:29 -07:00
Vinit Deshpande
50234a19aa am 22592afd: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev
* commit '22592afdd5d35618ddd5f8662994d8c15cf43d3f':
  Fix automatic Wi-fi toggle
2014-09-19 18:37:05 +00:00
Vinit Deshpande
22592afdd5 am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev
* commit '9a8c58d49dd84a45f216349fd4cbc2dacfdac9fe':
  Fix automatic Wi-fi toggle
2014-09-19 18:29:45 +00:00
Vinit Deshpande
9a8c58d49d Merge "Fix automatic Wi-fi toggle" into lmp-dev 2014-09-19 18:21:57 +00:00
PauloftheWest
a4b8fb36b4 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
2014-09-19 08:08:26 -07:00
Zoltan Szatmary-Ban
30b4aa9f27 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
2014-09-19 10:49:08 +00:00
Zoltan Szatmary-Ban
28277ee9fa am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev
* commit '6e1d8277e6c6443ad286bf25a7decb4f5a9b0cdf':
  Show Power usage details for the correct user
2014-09-19 10:38:17 +00:00
Zoltan Szatmary-Ban
6e1d8277e6 Merge "Show Power usage details for the correct user" into lmp-dev 2014-09-19 10:27:47 +00:00
Matthew Xie
3d76c26887 am a93c4cae: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev
* commit 'a93c4cae6df26926a8e8b054135c40c71f147226':
  Do not overwrite alias with device name
2014-09-19 00:43:55 +00:00
Matthew Xie
a93c4cae6d am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev
* commit '72c34e6a956a54ed023d207b41f5d21365b15c38':
  Do not overwrite alias with device name
2014-09-19 00:31:59 +00:00
Matthew Xie
72c34e6a95 Merge "Do not overwrite alias with device name" into lmp-dev 2014-09-19 00:23:34 +00:00
Matthew Xie
2f837509dd Do not overwrite alias with device name
Bug: 17287682
Change-Id: Iea29e85125ae4720fd99f893f516c301b7aed7c6
2014-09-18 22:54:22 +00:00
Paul Lawrence
ced7db460f Hide controls once password is known good
Bug: 17551103
Change-Id: I4fd182b7ac7a9ad7c1483979d4510b50b52e520f
2014-09-18 11:23:40 -07:00
PauloftheWest
50a53bdbe3 am f6526146: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit 'f6526146250ff68df0f8941fe0b91ae74d55ab8d':
  Removed an extraneous messge when pairing.
2014-09-18 16:11:54 +00:00
PauloftheWest
f652614625 am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '0f01eeff84ebdb93f24398d3adb5f214ae1ce2bb':
  Removed an extraneous messge when pairing.
2014-09-18 16:01:15 +00:00
PauloftheWest
0f01eeff84 Merge "Removed an extraneous messge when pairing." into lmp-dev 2014-09-18 15:51:50 +00:00
Sander Alewijnse
09c1ddc565 am b997bd50: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
* commit 'b997bd50ec5962842c50b1fdf4a50995e7b2a251':
  Update targetSdkVersion check.
2014-09-18 11:55:46 +00:00
Sander Alewijnse
b997bd50ec am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
* commit '4241b0a9627e424adb897ec894a34ddce8fd77e3':
  Update targetSdkVersion check.
2014-09-18 11:45:44 +00:00
Sander Alewijnse
4241b0a962 Merge "Update targetSdkVersion check." into lmp-dev 2014-09-18 11:36:31 +00:00
Zoltan Szatmary-Ban
7a2ccf201e 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
2014-09-18 12:06:56 +01:00
Mark Salyzyn
9d690250b8 am 66718d5a: am 894af268: logd: settings: ro.config.low_ram support
* commit '66718d5a6e51d58a83b186bdd2cc1b6665d0020c':
  logd: settings: ro.config.low_ram support
2014-09-17 23:32:00 +00:00
Mark Salyzyn
66718d5a6e am 894af268: logd: settings: ro.config.low_ram support
* commit '894af268def8a817306ea83f21cb25b6f0edf2e3':
  logd: settings: ro.config.low_ram support
2014-09-17 23:25:54 +00:00
Mark Salyzyn
894af268de 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
2014-09-17 22:26:16 +00:00