Commit Graph

7005 Commits

Author SHA1 Message Date
Elliott Hughes
76ddf4113a Merge "Fix /proc/version parsing in Settings." 2012-09-10 18:02:38 -07:00
Elliott Hughes
d267d377fb Fix /proc/version parsing in Settings.
Change-Id: I4bde0e4935eaa4c27067062443a051976daa115d
2012-09-10 17:58:15 -07:00
Elliott Hughes
cfbc61de3f Merge "Stop using getDSTSavings." 2012-09-06 15:50:10 -07:00
Elliott Hughes
6c7f55ee4b Stop using getDSTSavings.
The original code was actually correct, but code calling inDaylightTime
and getDSTSavings directly is inherently suspect, so I want to clean up
this false positive along with the real abusers.

Bug: 6901488
Change-Id: I6c89e7aa29d88b81ed2c7fd6c915e0346b90a442
2012-09-06 15:42:09 -07:00
Elliott Hughes
33f8619677 Merge "Stop hard-coding sample 12- and 24-hour times." 2012-09-06 15:29:47 -07:00
Elliott Hughes
82723df002 Stop hard-coding sample 12- and 24-hour times.
Bug: 6881640
Change-Id: I6b0d6404b0299f9efa8fd12779799f703f1c764f
2012-09-06 14:49:35 -07:00
Wink Saville
2d6b52bd38 Merge "Fix memory leak in ApnSettings-activity" 2012-08-28 12:01:29 -07:00
Jean-Baptiste Queru
38ce5194e8 Merge "Enable to delete a stored persistent group from p2p settings." 2012-08-28 10:46:59 -07:00
Yoshihiko Ikenaga
f3f14665a3 Enable to delete a stored persistent group from p2p settings.
Enable to delete a stored persistent group from p2p settings.
The multilingualization has NOT been done yet.

Change-Id: I84bd89343c9e3ce5e62b8b96dfce9d286675b145
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2012-08-28 15:16:38 +09:00
Amith Yamasani
52d996edeb Merge "Settings: Fix crash seen when setting the radio band" 2012-08-25 11:55:42 -07:00
Jean-Baptiste Queru
1183f487c8 Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active" 2012-08-23 09:31:36 -07:00
Jean-Baptiste Queru
578700afb1 Merge "Settings: disable Lock SIM card till response is received" 2012-08-21 13:40:29 -07:00
Jeevaka Badrappan
48c0383125 Settings: disable Lock SIM card till response is received
Lock SIM card checkbox is enabled always which results in
allowing the user to change the state even before the
previous change has been completed successfully. Due to
this option, UI ends up in state where it can send
disable Lock SIM card twice resulting in operation
not allowed error from modem.

Change-Id: I0f4a344a8d76720e75accf3a763c3d0e940a0dca
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 9954
2012-08-21 17:00:22 +08:00
Jake Hamby
c46455ac7a Merge "Enable "APN roaming protocol" for all platforms" 2012-08-20 17:27:36 -07:00
Jean-Baptiste Queru
0c869d694b Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected." 2012-08-17 08:51:18 -07:00
Jean-Baptiste Queru
d61c23b3c2 Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up" 2012-08-17 08:51:14 -07:00
Jeevaka Badrappan
26ef2c3436 Settings: Fix crash seen when setting the radio band
When the user presses back before the set radio band
result dialog is shown, crash is seen as the activity
associated with this is already finishing.

Check the activity status before displaying the
set radio band result alert dialog.

Change-Id: I34104773f5cce0be6d0021823b2889aad0fdb945
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 39317
2012-08-17 14:21:08 +08:00
Li Wenji
83397eab96 TetheringSetting: Keep Tethering checkbox unchecked until tethering up
When click Tethering, the checkbox will be checked and then unchecked,
and finally move to checked states. This causes confusing to end user,
we need to keep Tethering checkbox unchecked before tethering is really
up.

Change-Id: If2314b7dd1369e619dead45af38fd53c7e89c34e
Author: Li Wenji <wenji.li@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 18281
2012-08-16 14:47:43 +08:00
Wu, Hao
b76be1f8d4 UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
Add accessory flag to track accessory status. Disable MTP/PTP button
when Usb is working in accessory mode.

Change-Id: I3edcd2a7eb281db3bb9d345429643b77a237812e
Author: Wu, Hao <hao.wu@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 27200
2012-08-16 14:45:55 +08:00
Jean-Baptiste Queru
5dbc1f6405 Merge "Fix use of holo drawables in a few more places" 2012-08-14 08:19:21 -07:00
Björn Lundén
c8272b0752 Fix use of holo drawables in a few more places
Change-Id: Ie549ff14812da807729641fab1871fffe35f80b6
2012-08-14 01:25:21 +02:00
Jeff Sharkey
42eb3fb258 Merge "Fix the issue the setting crashes after unmount SD card in landscape" 2012-08-13 13:17:12 -07:00
Jeff Sharkey
d7db6baac7 Merge "Don't direct to market if no markets installed" 2012-08-13 13:14:08 -07:00
Jean-Baptiste Queru
eefa61ed2e Merge "Settings: Use ICS alert drawable" 2012-08-13 11:53:46 -07:00
Jack Wang
481582f4ec Fix memory leak in ApnSettings-activity
When destroying the activity, the HandlerThread isnt stopped. This
results in that the thread remains, and if you enter/exit the
activity multiple times, you will end up with multiple threads and
a small memory leak

Change-Id: I4779d2625e6002b55066dd034c84d743b9f80ef5
2012-08-13 15:25:04 +02:00
Chuanxiao Dong
66e7f0a393 Fix the issue the setting crashes after unmount SD card in landscape
When rotate the phone, mLastClickedMountToggle and mClickedMountPoint
would be destroied which made dialog access NULL pointer.

Change-Id: Ic96fce93828ca7a6f8749fad6a258eb47831e062
Author: Chuanxiao Dong <chuanxiao.dong@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 26569
2012-08-10 10:49:45 +08:00
Li Gang
8218d3ba18 MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
Check the USB connection status and MTP/PTP setting, if USB connected and MTP/PTP enabled,
disable the erasing and umount operation.
Judge SD card Mounting status and keep summary string.

Change-Id: Iff3e0f25b581bc462c88fff59eb93d765baaddd7
Author: Li Gang <gang.g.li@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 47043
2012-08-10 10:20:48 +08:00
Tore Anderson
68b9a26543 Enable "APN roaming protocol" for all platforms
Allows users to change the protocol (the PDP context type) used when
roaming in the same way they already can for when they are in their home
network. This is required in order to make IPv6 and IPv4v6 data roaming
work correctly in 3GPP networks.

See also: http://code.google.com/p/android/issues/detail?id=32631

Change-Id: I052842122e5fe96a8779077f0ae9ff4bc83066c5
Signed-off-by: Tore Anderson <tore@fud.no>
2012-08-08 23:10:35 +02:00
Jean-Baptiste Queru
5d72b27267 Merge "Add support for SE Android to the Settings app." 2012-08-08 13:19:26 -07:00
Xingrun Chen
fc2e1ac055 Don't direct to market if no markets installed
The search intent cannot be resolved if there aren't any
market apps installed, so it will cause Settings crashed by
the ActivityNotFound exception.

So we need to check if the market intent requst can be resolved.
Then determine to notify user to direct the accessibility services
to market to get TalkBack or not.

Change-Id: I0f0d7b54eb5215e1a886315bb6816704384f6c59
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
2012-07-26 00:41:15 +08:00
Stephen Smalley
b4e84f34e0 Add support for SE Android to the Settings app.
Display SELinux status (disabled, permissive, enforcing) under About phone.

Change-Id: I69529fb7a3adfe31eccb16d79740fc4952ff5e68
2012-07-20 15:41:29 -07:00
Wink Saville
9ad4a89877 Use telephony-common - DO NOT MERGE
Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
2012-07-17 12:23:26 -07:00
Ying Wang
51b2fef235 am 39aade5b: Import translations. DO NOT MERGE
* commit '39aade5b4e6b134bbd3962dc14efc4a9571bb8ab':
  Import translations. DO NOT MERGE
2012-07-03 14:56:07 -07:00
Ying Wang
39aade5b4e Import translations. DO NOT MERGE
Change-Id: I1634d69f5cdd74a0c33cc4796a1a17e89376a1e3
Auto-generated-cl: translation import
2012-07-03 13:41:30 -07:00
Irfan Sheriff
51cc655ccd am 2fad853b: Merge "Limit length of SSID input string to 32"
* commit '2fad853bf7282676ee3f2ec87630de5fdbcb236b':
  Limit length of SSID input string to 32
2012-07-03 12:18:35 -07:00
Irfan Sheriff
7c8363eb11 am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"
* commit 'd80ff0a4d615bd6f037483bf9dc2b10887d9507f':
  wifi: update text displayed during hotspot on/off
2012-07-03 12:18:33 -07:00
The Android Open Source Project
df833bea37 Reconcile with jb-release
Change-Id: I80999c1ca708772a1483e03093144b53b60e5c1e
2012-07-03 12:12:16 -07:00
Irfan Sheriff
2fad853bf7 Merge "Limit length of SSID input string to 32" 2012-07-03 11:35:44 -07:00
Irfan Sheriff
d80ff0a4d6 Merge "wifi: update text displayed during hotspot on/off" 2012-07-03 11:30:05 -07:00
The Android Automerger
e413019654 merge in jb-release history after reset to jb-dev 2012-07-02 16:21:14 -07:00
Eric Fischer
23513ea53e am a1146f83: Import translations. DO NOT MERGE
* commit 'a1146f83a985ce613145ae1e89b9e7311906a3b7':
  Import translations. DO NOT MERGE
2012-07-02 14:37:15 -07:00
Eric Fischer
a1146f83a9 Import translations. DO NOT MERGE
Change-Id: Ic3255b6b87db2a3b98fd3b41e4ab0ef24d67e292
Auto-generated-cl: translation import
2012-07-02 13:55:16 -07:00
The Android Automerger
2150577ad4 merge in jb-release history after reset to jb-dev 2012-07-02 12:57:04 -07:00
Ying Wang
d15183a971 am 9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '9ca616e42520ff12de921b8c301ef4cf7cb6c95a':
  Import translations. DO NOT MERGE
2012-06-29 17:59:04 -07:00
Ying Wang
9ca616e425 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-29 17:54:50 -07:00
Dianne Hackborn
d601be8f94 am 313ab172: Fix issue #6761130: Clearing app data in settings does not clear app\'s USB storage
* commit '313ab1727014d535790bc89afdcf725ff936e5b4':
  Fix issue #6761130: Clearing app data in settings does not clear app's USB storage
2012-06-29 15:43:34 -07:00
Dianne Hackborn
313ab17270 Fix issue #6761130: Clearing app data in settings does not clear app's USB storage
The installed app details was not correctly distinguishing between cache and
normal data on external storage.  The cache files on external storage are now
correctly shown in the cache section, since those are what get deleted when
you hit the clear cache button.

Change-Id: Id98bdb7fb5202d6a092fe5a772638eeb6aed2b47
2012-06-29 15:01:23 -07:00
Ying Wang
92b47c3690 Import translations. DO NOT MERGE
Change-Id: Ic81c64b7405a6de52473a90f61d58242779c8bf5
Auto-generated-cl: translation import
2012-06-29 13:19:19 -07:00
The Android Open Source Project
4aa42e2ea1 Reconcile with jb-release
Change-Id: Idef831103e3ee313ae771483241391f90f5feafb
2012-06-29 08:14:15 -07:00
The Android Automerger
f2dbd0fa9d merge in jb-release history after reset to jb-dev 2012-06-28 17:11:24 -07:00