Commit Graph

5233 Commits

Author SHA1 Message Date
Matthew Xie
0223f9c5dd Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change" 2014-02-24 00:49:19 +00:00
Jeff Sharkey
14136c7cdf Merge "Settings: Fix the memory leak in Settings" 2014-02-21 17:17:22 +00:00
Srinu Jella
6892691421 Bluetooth: GAP: Cancel the pairing notification on bond state change
Cancel the pairing notification on bond state change happens from
BOND_BONDING to BOND_NONE.  Otherwise it will present in the
notification area until it gets cancelled by opening it and press
cancel on pairing dialog.

Change-Id: I96f673e29e612cd748165a1323a5b4a4276a843c
2014-02-19 15:04:08 +05:30
Jeff Sharkey
1f37bff7d2 Merge "Total and available fields missing in Settings storage menu" 2014-02-06 22:29:11 +00:00
Jeff Sharkey
5b4350f22f Merge "Fix memory leak in ManageApplication" 2014-02-06 22:25:30 +00:00
Brian Carlstrom
7a60db234a packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
Bug: 12798969
Change-Id: I1937c2ff758214e1c9d369e475ae4efbba4f9dec
2014-01-30 13:17:08 -08:00
Per Allard
6251d707b1 'When to daydream' dialog does not follow the JB dialog design guide
The dialog is a single selection popup and according to the
dialogs design guide the popup should close when the user
has make his/her choice, but in this case it does not.

Change-Id: Iac6bc19146a88236d3253d2d846212ce09b4925b
2014-01-23 18:15:56 +09: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
Jeff Sharkey
b5377a7165 Merge "Fix null pointer exceptions in NetworkPolicyEditor" 2014-01-10 23:04:31 +00:00
Amith Yamasani
5be77489e2 Merge "Dont show "Erase SD Card" when there is none" 2014-01-07 18:37:54 +00: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
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
Kenny Root
7440dde808 Use java.util.Objects instead of internal API
Change-Id: Ib0d797b3e7f2e4f831f52832776b64c0973880b3
2013-12-13 13:28:33 -08:00
The Android Open Source Project
b568548747 Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD 2013-12-05 12:38:23 -08:00
Amith Yamasani
e10f852822 Merge "Fix switching running/cached apps with memory bar" 2013-12-04 19:17:33 +00:00
Lorenzo Colitti
5448b25481 Dynamically update connectivity and IP address.
The settings status page dynamically updates mobile network
status (in/out of service, signal strength, network type, etc.)
but not IP address and connectivity information. Dynamically
update that information as well, for consistency.

For consistency, also update the advanced wifi settings page.

[Cherry-pick of deb8f08ace]

Bug: 10232006
Change-Id: I3a292d8bd9e36ab16c37e107eefff4b37d884a4c
2013-11-25 17:34:45 +09:00
Lorenzo Colitti
b088c8a7c7 Cache preferences and services in status dialog.
Currently, the status dialog fetches the preferences and system
services that it uses to display connectivity information (e.g.,
IP and MAC addresses) only when the dialog is first opened. This
is fine because the connectivity information is only filled in
once and never updated.

In order to have this information update dynamically (like the
rest of the dialog), fetch and cache these objects in onCreate.
The next change will actually make this information update on
network changes.

[Cherry-pick of 6eb6a90821]

Bug: 10232006
Change-Id: Ib4072674543e517cf6935e3e03f35090e728090a
2013-11-25 17:34:08 +09:00
The Android Open Source Project
ca99cb71ea Merge commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e' into HEAD 2013-11-22 10:35:36 -08:00
Svetoslav
03360cd239 am 196bc5c6: am e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
* commit '196bc5c63a3f08bc8dc972ee82f7fe98a453b8f5':
  Show correct message for a print job that is being canceled.
2013-11-14 22:30:53 -08:00
Svetoslav
e7b781f574 Merge "Show correct message for a print job that is being canceled." into klp-dev 2013-11-15 06:23:54 +00:00
Svetoslav
97e962cd36 Show correct message for a print job that is being canceled.
1. If a print job is being canceled we now show appropriate
   message that matches what the notification shows.

2. If a print job is being canceled we do not show the cancel
   button.

bug:11696928

Change-Id: I0fc4f8226c4aa9acd6a4b65811f4228e56018315
2013-11-14 18:15:19 -08:00
Jim Miller
f75a736a3e am 31ee7e19: am fb3d5cad: Don\'t show keyguard on top of CryptKeeper
* commit '31ee7e19a040ab7660d39a6693f6ed38f7c961ad':
  Don't show keyguard on top of CryptKeeper
2013-11-14 16:29:39 -08:00
Jim Miller
fb3d5cad48 Don't show keyguard on top of CryptKeeper
The fix in Change Ifbe4cdf40e3b76d2069ecace940f85fa58f31187 causes
keyguard to be more aggressive about showing itself.

CryptKeeper itself should explicitly dismiss keyguard.

Fixes bug 11680832

Change-Id: I87287762b73bdffc6f1800379f02f70f4bd873a8
2013-11-14 14:40:22 -08:00
David Christie
9605791d41 am 7ff9f2b4: am b1ded62f: Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev
* commit '7ff9f2b488e4017c7b3385fb067a14cfc07764fb':
  Update power widget icons and fix location behavior Bug: 11242129
2013-11-14 14:20:31 -08:00
David Christie
b1ded62f3f Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev 2013-11-14 20:12:42 +00:00
Jeff Brown
0df39f39fc am 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '2fba8be9c0c9da814e40af00847f3f2d28cf7f01':
  Integrate remote display routes into screen cast settings UI.
2013-11-11 10:27:24 -08:00
Jeff Brown
4e54c2a177 Integrate remote display routes into screen cast settings UI.
Merged remote display route selection into the existing wifi
display preference UI.  Moved the on/off toggle over to a menu item.

The preference page is now mainly implemented in terms of the
media router.  It only interacts with the display manager for the purpose
of pairing with new devices or making wifi display certification
controls available.

This means that the observed state is now completely consistent across
the system ui, settings, and applications that use the media router.

Bug: 11257292
Change-Id: I3705570812384fef4bfffeccaaccf7895d370d12
2013-11-10 21:20:16 -08:00
David Christie
587e6bf3fc Update power widget icons and fix location behavior
Bug: 11242129

Change-Id: I29f5b4cf914ece4b0991229f384012eb66ba3820
2013-11-07 11:20:35 -08:00
Robert Greenwalt
6c20565d97 am 384bf727: am 29b7a844: Merge "Add batch scan data to power stats." into klp-dev
* commit '384bf72708b623bf48a0395a51db94bda055f496':
  Add batch scan data to power stats.
2013-11-07 10:43:11 -08:00
Robert Greenwalt
29b7a8446a Merge "Add batch scan data to power stats." into klp-dev 2013-11-07 18:31:03 +00:00
Kenny Root
d0e1c273db am 279c1e15: am d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
* commit '279c1e15d23254728783ad99faff7349d9543ac4':
  Revert "Accessibility: filter touches to Enable button"
2013-11-06 15:14:35 -08:00
Kenny Root
d0de39e716 Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev 2013-11-06 23:09:06 +00:00
Kenny Root
b974fa8034 Revert "Accessibility: filter touches to Enable button"
This reverts commit 94d4f23dcc.

Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
2013-11-06 22:03:52 +00:00
Lifu Tang
227043b557 am 5b68e4c8: am 741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev
* commit '5b68e4c8d09d9c0cc864e32970c9af925dd0d643':
  Shows LGAAYL when launching Location Settings
2013-11-05 22:26:19 -08:00
Lifu Tang
741bc05424 Merge "Shows LGAAYL when launching Location Settings" into klp-dev 2013-11-06 06:20:56 +00:00
Jason Monk
58f53f9c35 am c85359ef: am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
* commit 'c85359ef11221c09e7a5d55692ffda0f98b8e00c':
  Add PAC UI to Wi-Fi Settings
2013-11-05 18:56:49 -08:00
Jason Monk
4e42c80872 Merge "Add PAC UI to Wi-Fi Settings" into klp-dev 2013-11-06 02:20:50 +00:00
Jason Monk
070f3560d5 Add PAC UI to Wi-Fi Settings
Now when a PAC URL is set it shows it in settings rather than the proxy
spinner set to None.  This should only be visible in EDU users as only EDU
has PAC.

Bug: 11528608
Change-Id: Ie4bad8ea935f0a8f1bb7877eb2be146e06d71c2d
2013-11-05 14:39:44 -05:00
Elliott Hughes
c26cdd10cf am 98f5e186: am c3a6cd6e: Merge "Move a line into try block"
* commit '98f5e1861da4d708e7199b5d563895cf4d2c8db7':
  Move a line into try block
2013-11-05 10:35:25 -08:00
Elliott Hughes
98f5e1861d am c3a6cd6e: Merge "Move a line into try block"
* commit 'c3a6cd6ee531c81f776551caa40b63732115e971':
  Move a line into try block
2013-11-05 10:30:01 -08:00
Kenny Root
8f40097e16 am 18964c90: am 8cc60da4: Merge "Accessibility: filter touches to Enable button" into klp-dev
* commit '18964c90638dd6d2cdaaaed3001aec40482f45b1':
  Accessibility: filter touches to Enable button
2013-11-04 21:55:21 -08:00
Kenny Root
8cc60da4c9 Merge "Accessibility: filter touches to Enable button" into klp-dev 2013-11-05 00:12:19 +00:00
Lifu Tang
fe9420f7da Shows LGAAYL when launching Location Settings
- Partial fix of b/10897468

Change-Id: Iec96909b87e71869c5a020ce848c6cf4fada3616
2013-11-04 11:37:55 -08:00
Shuhrat Dehkanov
7e77699895 Move a line into try block
Currently, NumberFormatException is never handled as
Integer.parseInt() is called outside try block.
This moves that line inside try block.

Change-Id: I54544f5a665ca0f821de5351001755cb965078dc
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
2013-11-01 17:39:44 +09:00
Satoshi Kataoka
67b3039d37 am 2cab1344: am aa4fa0ea: Fix a bug on updating enabled IMEs
* commit '2cab1344037ada26710047138b59c2f8f0f4dfee':
  Fix a bug on updating enabled IMEs
2013-10-31 15:10:17 -07:00
Satoshi Kataoka
aa4fa0ea09 Fix a bug on updating enabled IMEs
Bug: 11354619
Change-Id: Ie33630b3dc150536bc0325ad6116ea5fdcf60740
2013-11-01 07:00:13 +09:00
Chris Wren
ed4c3aacfb am 455bf4d3: am 1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.
* commit '455bf4d3395e828dfbeca1f2ef5696e960874ad1':
  remove lockscreen widget checkbox when there's no lockscreen.
2013-10-29 12:01:47 -07:00
Chris Wren
1630ef4fc5 remove lockscreen widget checkbox when there's no lockscreen.
Bug: 11190345
Change-Id: I1b48e7a6a70226b103d8a6a27bd3374ff8349b3f
2013-10-29 13:42:05 -04:00
Jeff Sharkey
8cd39351fe am bd5cbb04: am fd845410: Merge "remove primary condition check on storage format." into klp-dev
* commit 'bd5cbb0400366faade3586e19f1deae2350c0ddd':
  remove primary condition check on storage format.
2013-10-25 15:06:12 -07:00