Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,156 Commits 1 Branch 0 Tags
0b71937d304d701fb0edc1cd3720bcadb264d9f9
Commit Graph

5281 Commits

Author SHA1 Message Date
RoboErik
0b71937d30 am 5791cecc: b/12068020 Update calls to InputManager. Do not merge 
* commit '5791cecc9e0a4169c71b87696973441071e295c8':
  b/12068020 Update calls to InputManager. Do not merge
 2014-03-12 21:12:27 +00:00
RoboErik
5791cecc9e b/12068020 Update calls to InputManager. Do not merge 
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/400419/

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: I9072c5b5c822b73188a6c572945f87b4a7c03139
 2014-03-12 12:53:46 -07:00
Narayan Kamath
d4cf5c5578 am c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""" 
* commit 'c776bbb1562b844297260790fd1a50382396a3f9':
  Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
 2014-03-11 15:14:15 +00:00
Narayan Kamath
c776bbb156 Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""" 2014-03-11 15:07:14 +00:00
Narayan Kamath
0a2bc1cc76 Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."" 
This reverts commit 9ebc27c73e.

Change-Id: Id440bd004fee696472aeec9eefa5732755b19627
 2014-03-11 13:05:37 +00:00
Matthew Xie
b114005305 am 85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946" 
* commit '85fb88ee10c6bb901d30e50038b4a86252ff8c68':
  HTML injection fix for bluetooth pairing, issue 65946
 2014-02-27 21:39:34 +00:00
Rob Fletcher
7b0686af2f HTML injection fix for bluetooth pairing, issue 65946 
During bluetooth pairing, HTML injection is possible via the device name displayed to the user. This escapes the device name, before creating HTML from it, so it will preserve things like < and > but will not affect rendering of HTML

Bug: 12976386
Change-Id: I8a02d3be8c1a779dc9ed1c9ef8083a1159ab3f2b
 2014-02-27 19:46:12 +00:00
Narayan Kamath
729c83a4f8 am 7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."" 
* commit '7f1c81b7b58a6a938494ed8f06d9fcf915226ba1':
  Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
 2014-02-27 12:05:07 +00:00
Narayan Kamath
9ebc27c73e Revert "Set 24 hour pref. with ACTION_TIME_CHANGED." 
This reverts commit d5d9d37361.

Change-Id: I76eeb6f95a4cbbd241db1fb90528b4d91ddf7707
 2014-02-27 12:00:08 +00:00
Narayan Kamath
ef3a0be922 am 14b0da74: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED." 
* commit '14b0da749c73c1e0201adee1b398a1955b7d624e':
  Set 24 hour pref. with ACTION_TIME_CHANGED.
 2014-02-27 11:46:48 +00:00
Narayan Kamath
d5d9d37361 Set 24 hour pref. with ACTION_TIME_CHANGED. 
Sent as a boolean extra EXTRA_TIME_PREF_24_HOUR_FORMAT.

Change-Id: I7fbd59eacdeb298d046da950d7045f0bab53b462
 2014-02-26 13:43:32 +00:00
Matthew Xie
27543d42ff am 0223f9c5: Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change" 
* commit '0223f9c5ddfdbcd2c759d1b0cf289844ca0438c0':
  Bluetooth: GAP: Cancel the pairing notification on bond state change
 2014-02-24 14:25:28 +00:00
Matthew Xie
0223f9c5dd Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change" 2014-02-24 00:49:19 +00:00
Jeff Sharkey
e038823076 am 14136c7c: Merge "Settings: Fix the memory leak in Settings" 
* commit '14136c7cdfee7525a97cfee6eec038994668b6a5':
  Settings: Fix the memory leak in Settings
 2014-02-21 17:21:48 +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
abe6b83559 am 1f37bff7: Merge "Total and available fields missing in Settings storage menu" 
* commit '1f37bff7d26aeb3d1f16deb4368f8387e2d4530f':
  Total and available fields missing in Settings storage menu
 2014-02-06 22:36:40 +00:00
Jeff Sharkey
a5b5bfbbef am 5b4350f2: Merge "Fix memory leak in ManageApplication" 
* commit '5b4350f22f81662436992504e711e462de7a790f':
  Fix memory leak in ManageApplication
 2014-02-06 22:31:26 +00:00
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
Amith Yamasani
8052091f46 am aea431f2: am f6971ee1: am 454df35e: am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit 'aea431f24bc19cc24530cee4db01033f8503a67d':
  Remove unused DebugIntentSender
 2014-02-05 20:46:37 +00:00
Amith Yamasani
aea431f24b am f6971ee1: am 454df35e: am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit 'f6971ee1d52a0e258fa60306b07cb8348d88baf8':
  Remove unused DebugIntentSender
 2014-02-05 20:43:52 +00:00
Amith Yamasani
f6971ee1d5 am 454df35e: am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '454df35ee323ec9ca21b0c1ed982eba263df70e3':
  Remove unused DebugIntentSender
 2014-02-05 20:40:39 +00:00
Amith Yamasani
3c4603ef1c am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '8f9482170835059c11cffa9c554191306db49fbd':
  Remove unused DebugIntentSender
 2014-02-05 20:35:24 +00:00
Amith Yamasani
8f94821708 am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit 'c68a6bde44203cae70c50f6194cce22c9be5c48e':
  Remove unused DebugIntentSender
 2014-02-05 12:33:48 -08:00
Amith Yamasani
0ad774458a am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '7c0ada65542f2c9b3899337b085aace13fcc7142':
  Remove unused DebugIntentSender
 2014-02-05 11:52:23 -08:00
Amith Yamasani
7c0ada6554 am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '3f72207985a5a636d14800d0b8094c28220a8e00':
  Remove unused DebugIntentSender
 2014-02-05 11:27:30 -08:00
Amith Yamasani
0fce6123bd am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
  Remove unused DebugIntentSender
 2014-02-05 11:15:01 -08:00
Amith Yamasani
7a2d8bd4b0 am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '49d502a45d9b7536d38210590c99d8c99a43e4d9':
  Remove unused DebugIntentSender
 2014-02-05 11:09:40 -08:00
Amith Yamasani
49d502a45d am c7843db0: Remove unused DebugIntentSender 
* commit 'c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
  Remove unused DebugIntentSender
 2014-02-05 11:04:25 -08:00
Amith Yamasani
c7843db06c Remove unused DebugIntentSender 
Bug: 12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit 26430486e4)
 2014-02-04 23:48:05 +00:00
Brian Carlstrom
0105c00519 am f2e9be9a: Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default" 
* commit 'f2e9be9a4bb4c030c9bbcb29990e8b22bab809e4':
  packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
 2014-01-31 13:00:33 +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
John Spurlock
af87ce0991 am 04119285: am cb8a5354: am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide" 
* commit '041192855ed8b025246578d80f0b372bf346a2f1':
  'When to daydream' dialog does not follow the JB dialog design guide
 2014-01-28 15:48:12 +00:00
John Spurlock
cb8a53541e am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide" 
* commit '3f0f02b94e5be6724659f860aef5e637ff61d3aa':
  'When to daydream' dialog does not follow the JB dialog design guide
 2014-01-28 15:40:45 +00: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
Wei Wang
f4f8d9f346 BLE peripheral mode (4/4): Settings change for advertising preference. 
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
 2014-01-14 18:06:42 -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
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
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
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
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
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
The Android Open Source Project
b568548747 Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD 2013-12-05 12:38:23 -08:00
Amith Yamasani
ff0fad2a06 am e10f8528: Merge "Fix switching running/cached apps with memory bar" 
* commit 'e10f8528220fc4506ff6deee5c71ddab3da5e21d':
  Fix switching running/cached apps with memory bar
 2013-12-04 13:05:17 -08:00