Commit Graph

5495 Commits

Author SHA1 Message Date
Wei Wang
f4f8d9f346 BLE peripheral mode (4/4): Settings change for advertising preference.
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
2014-01-14 18:06:42 -08:00
Wei Wang
c0af0c4633 Merge "BLE peripheral mode (4/4): Settings change for advertising preference." 2014-01-15 01:43:37 +00:00
Fabrice Di Meglio
a3d0158ff6 More code cleaning (missing items)
- corrected the missed "switch_" variable naming
- optimize imports more

Change-Id: I8501c99d65e91f26fc56f589e02a1fd1be3d81a3
2014-01-14 16:32:10 -08:00
Fabrice Di Meglio
d45cf417bc Merge "More code cleaning" 2014-01-14 22:23:50 +00:00
Fabrice Di Meglio
ad38a88b95 More code cleaning
- remove some dead code
- better variable naming
- add debug log for exception
- clean some unused imports

Change-Id: Iec4239a7e75f29d860f286ab089e748e8a672281
2014-01-14 14:04:04 -08:00
Jun Su
f3a9578910 Fix memory leak in ManageApplication
ApplicationsAdapter new a Session member and make it has a reference to
it self. If we don't release it explicitly, the cross reference will
cause memory leak.

Change-Id: Iecce35ae1d56d98cee6347e84d3a3ff57f3b15a5
2014-01-14 03:47:01 +00:00
Dianne Hackborn
4792823f71 Merge "Add "unaccounted" item to battery use UI." 2014-01-14 01:52:12 +00:00
Wei Wang
eb56b9ccb8 BLE peripheral mode (4/4): Settings change for advertising preference.
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
2014-01-13 17:41:02 -08:00
Dianne Hackborn
5b6f59a072 Add "unaccounted" item to battery use UI.
Kind-of informative.

Change-Id: I10d2ee1ad8fe598a1ce1989df6628da11b82d906
2014-01-13 17:40:50 -08:00
Andres Morales
96b0b43a8a Merge "Reduce timeout of dismissing pairing dialog on success" 2014-01-14 00:26:37 +00:00
Jeff Sharkey
6235eb5466 am ba646e3a: am 0cd68e04: am 859909fe: am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"
* commit 'ba646e3af11db80936ad9f8df20deb7a318ed46a':
  Fix null pointer exceptions in NetworkPolicyEditor
2014-01-10 23:16:22 +00:00
Jeff Sharkey
859909fee8 am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"
* commit 'b5377a7165a1f09c3cbd5c76f5a5745f6efc28e5':
  Fix null pointer exceptions in NetworkPolicyEditor
2014-01-10 15:08:40 -08:00
Jeff Sharkey
b5377a7165 Merge "Fix null pointer exceptions in NetworkPolicyEditor" 2014-01-10 23:04:31 +00:00
Fabrice Di Meglio
57a7329cf6 Merge "Code cleaning for removing dual pane meta data as it is no more used" 2014-01-10 22:23:50 +00:00
Fabrice Di Meglio
8c4ccb87ca Code cleaning for removing dual pane meta data as it is no more used
- remove META_DATA_KEY_PARENT_TITLE and META_DATA_KEY_PARENT_FRAGMENT_CLASS

Change-Id: Ied38e9a26e3c47edec56437818bb6f2daa7f8621
2014-01-08 15:53:44 -08:00
RoboErik
813a54d216 b/12068020 Update calls to InputManager
This is part of work on making key layouts get saved per vendor/product
instead of per device. The corresponding change in fw is
https://googleplex-android-review.git.corp.google.com/#/c/399886/
This changes all uses of InputDevice descriptor to InputDeviceIdentifier.

Change-Id: I3eeebc0223820aeab62c2b8aa822f4d91adaf2d1
2014-01-08 13:57:34 -08:00
Yuhao Zheng
f20f5ce89a Merge "Make wifi dialog persist after orientation change" 2014-01-07 19:39:13 +00:00
Amith Yamasani
ecc1730a9c am 200b6c63: am 3cfb6767: am e7d8485a: am 5be77489: Merge "Dont show "Erase SD Card" when there is none"
* commit '200b6c63237bcf1d911d5e8b48a4cd2f05d0ce3d':
  Dont show "Erase SD Card" when there is none
2014-01-07 19:23:09 +00:00
Yuhao Zheng
6c81d90be3 Make wifi dialog persist after orientation change
Wifi "cancel/forget/connect" pop-up window does not persist after orientation
changes. Specifically, after orientation changes, the connect button disappears.

This is because dialog information is not saved properly. When a saved wifi
config is found in the scan results, this entry is BOTH a wifi config AND a scan
result. Previous implementation has 2 issues:

1. Scan result part isn't saved. That's why the connect button after orientation
   changes, as UI didn't see a scan result section and thought it's not in range.

2. When both wifi config and scan result are saved, they are not restored
   correctly. Restoring wifi config will reset mRssi field in scan result part,
   while restoring scan result will reset netowrkId in wifi config part.

Both issuses are fixed.

bug: 9053186
Change-Id: Ic3ee7b5931c91d4b2f5c723fb8718cf752463109
2014-01-07 10:59:30 -08:00
Amith Yamasani
e7d8485a23 am 5be77489: Merge "Dont show "Erase SD Card" when there is none"
* commit '5be77489e2f1f7b5c68763cf7660e844587d5e9e':
  Dont show "Erase SD Card" when there is none
2014-01-07 10:42:15 -08:00
Amith Yamasani
5be77489e2 Merge "Dont show "Erase SD Card" when there is none" 2014-01-07 18:37:54 +00:00
John Spurlock
3e9110fe6a Merge "Remove rotation-lock from Display settings." 2014-01-06 19:22:15 +00:00
Elliott Hughes
d954e2cc1c am 391af725: am 8995a94d: am 97886741: am f85d9841: Merge "Fix elapsed time formatting."
* commit '391af72514dfca243249fb873b639401bcf0c129':
  Fix elapsed time formatting.
2014-01-03 21:45:43 +00:00
Elliott Hughes
97886741b9 am f85d9841: Merge "Fix elapsed time formatting."
* commit 'f85d9841f8e198de656973a2102d3239e628390a':
  Fix elapsed time formatting.
2014-01-03 13:36:27 -08:00
Elliott Hughes
f7cb4b0dda Fix elapsed time formatting.
We should extend DateUtils to provide this kind of elapsed time
formatting via icu4c, but for now let's at least fix our
arithmetic.

Bug: https://code.google.com/p/android/issues/detail?id=61479
Change-Id: I6c087dbb9fdbff0a21d9243d239126fee180454c
2014-01-03 12:14:13 -08:00
Andres Morales
13c42cfefc Reduce timeout of dismissing pairing dialog on success
Change-Id: If4b74559cd6f628164b8b114c8c8b509dcb6b884
2013-12-30 12:56:55 -08:00
Selim Gurun
f64facc2f9 Display certificate chain
Bug: 5012010
Change-Id: Id1b4753b28ab3460662ea41feea277777e655780
2013-12-27 18:17:24 -08:00
Alan Viverette
7f9781b559 Merge "Additional caption settings for edge styles and window color" 2013-12-20 00:40:53 +00:00
Dianne Hackborn
09a3c1f949 Merge "Update to follow BatteryStats." 2013-12-19 22:51:47 +00:00
John Spurlock
26c3b25ac3 Remove rotation-lock from Display settings.
Ability to lock device to natural orientation is still available
under Accessibility.

Bug:11062710
Change-Id: I2045e16cfc676ee75d4d42b0cd652433b2f12715
2013-12-19 16:57:50 -05:00
Zhihai Xu
23d886f698 Merge "BLuetooth Discoverable timer not correctly cleared" 2013-12-19 21:49:50 +00:00
Kim Schulz
54313d7d66 BLuetooth Discoverable timer not correctly cleared
Changing the discoverable timer from 2min to infinity before the 2min timer
has passed will not clear the 2min timer.
This fix handles this case.

Bug: 12220031
Change-Id: I8794eda353c74e46b09e15ee9a7a491658e7b5cd
2013-12-19 13:45:11 -08:00
Dianne Hackborn
fb03058dc9 Update to follow BatteryStats.
Change data use to be based on packets instead of bytes.

Change-Id: I536dd2c2fc3fbeb12689e793f79e5fac984fe3af
2013-12-19 13:10:25 -08:00
Alan Viverette
d07c16107d Additional caption settings for edge styles and window color
Change-Id: Ib967bc566a7b8f7674c696fc05d799e12269ec42
2013-12-19 11:31:36 -08:00
Johan Redestig
5517ad92dd Dont show "Erase SD Card" when there is none
On devices with physcal, external SD Cards, the "Erase SD card"
option in in Settings/Storage is available even when there is
no SD card present, this dont make much sense since you cannot
erase a card that is absent. With this change the erase option
is bound to the mount toggle which leads to the following
consequences:

 Card present and mounted -> Erase enabled
 Card present but unmounted -> Erase enabled
 No card present -> Erase disabled
 Card present and MTP attached -> Erase disabled

Change-Id: I756ae8af3e0565febaf940df5f4991dd89105bd9
2013-12-19 10:47:17 +01:00
Behrooz Aliabadi
524dee0fb5 Fix null pointer exceptions in NetworkPolicyEditor
This upload fixes a null pointer exception issue.
After this fix the modified methods return
their corresponding default values instead of null.

Change-Id: Idb94f8b808b8dd18be5e3fc92cc5560ce0f81c4f
2013-12-18 09:55:45 +00:00
Alan Viverette
17bf9338f6 Merge "Update A11y service dialog for explicit create() before getButton()" 2013-12-17 01:20:41 +00:00
Andres Morales
73fed2c477 Merge "fix npe in SecuritySettings" 2013-12-16 19:27:30 +00:00
Andres Morales
5786e5f471 fix npe in SecuritySettings
Change-Id: Ib381cb7b985046fd4446e00ef67e3f2c12313796
2013-12-16 11:23:14 -08:00
Kenny Root
2d8e25af35 am 3bf6ac0c: am ead1bcd9: am ef2f97c7: am e14a5ef6: Merge "Use java.util.Objects instead of internal API"
* commit '3bf6ac0c0ea1fe05f925d8df3db2e35f674dce4a':
  Use java.util.Objects instead of internal API
2013-12-13 22:57:33 +00:00
Kenny Root
ef2f97c70e am e14a5ef6: Merge "Use java.util.Objects instead of internal API"
* commit 'e14a5ef660ebc65cad53c1e108c99d9fd98a4696':
  Use java.util.Objects instead of internal API
2013-12-13 13:58:59 -08:00
Kenny Root
7440dde808 Use java.util.Objects instead of internal API
Change-Id: Ib0d797b3e7f2e4f831f52832776b64c0973880b3
2013-12-13 13:28:33 -08:00
Andres Morales
ef693b5707 Merge "Settings for NFC Unlock" 2013-12-12 17:38:26 +00:00
Alan Viverette
72cb46f1b7 Update A11y service dialog for explicit create() before getButton()
Change-Id: Ic0fb7e2e7985dd3d3b65e40a639ab5fc0f5a8fd5
2013-12-11 16:07:00 -08:00
Vinit Deshapnde
c621418d3d Move Wifi/P2p service components under services
Some methods need to be public, since frameworks/base complies before
frameworks/base/services; and services takes build dependency on base.

Similar issue exists with WifiEnterpriseConfig constants.

Bug: 9907308
Change-Id: Ied0e3dee0b25c939067dbc66867a9814b3b3b68e
2013-12-11 16:05:46 -08:00
Alan Viverette
22b70376ed Merge "Accessibility: filter touches to Enable button" 2013-12-10 21:58:45 +00:00
Alan Viverette
24ef59737b Remove dialog offering to download TalkBack
GMS devices are required to have at least one accessibility service
installed, and AOSP devices will not have Play Store, so this dialog
is obsolete.

BUG: 10429642
Change-Id: I08db466b305a4a73c35325656d143afdfcecf061
2013-12-10 13:19:13 -08:00
Alan Viverette
96118a4d53 Accessibility: filter touches to Enable button
To prevent tap-jacking, filter touches to the enable button if there is
another window obscuring the screen.

Bug: 11242907
Change-Id: I0228cd480faf8e7ebf70394d9bb60fa2e4138fb4
2013-12-09 19:08:36 -08:00
Andres Morales
fd2b629335 Settings for NFC Unlock
Change-Id: Ifaa2717da6c364daa7af073e42fc8f6a097c14bb
2013-12-06 13:50:26 -08:00
The Android Open Source Project
b568548747 Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD 2013-12-05 12:38:23 -08:00