PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,603 Commits 1 Branch 0 Tags
de101033025c53ab8f16c31c57c003c757e47cec
Commit Graph

7603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Hamby
c46455ac7a Merge "Enable "APN roaming protocol" for all platforms" 2012-08-20 17:27:36 -07:00
Brian Muramatsu
e54660d8b6 Merge "display wireless charging status" into jb-mr1-dev 2012-08-20 16:58:31 -07:00
Baligh Uddin
5fdc526426 Import translations. DO NOT MERGE 
Change-Id: Idd1ece233eb5daf32683069ca5daa04718769c87
Auto-generated-cl: translation import
 2012-08-20 10:35:09 -07:00
Baligh Uddin
c76bfb9243 Import translations. DO NOT MERGE 
Change-Id: Id94a81adfd0845198795a16aaeb3b29fe7db1807
Auto-generated-cl: translation import
 2012-08-17 12:09:22 -07:00
Jean-Baptiste Queru
b40815c150 am 71742eb1: am 0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected." 
* commit '71742eb13276e93d18f6aead10a8f767134ab0af':
  UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
 2012-08-17 08:57:04 -07:00
Jean-Baptiste Queru
43231f2d6e am f4cc034e: am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up" 
* commit 'f4cc034e8c61a05b3e99ca4f698b3fe6de21bc98':
  TetheringSetting: Keep Tethering checkbox unchecked until tethering up
 2012-08-17 08:57:03 -07:00
Jean-Baptiste Queru
71742eb132 am 0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected." 
* commit '0c869d694b59a55c8d53b57a12393b55530e798e':
  UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
 2012-08-17 08:55:52 -07:00
Jean-Baptiste Queru
f4cc034e8c am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up" 
* commit 'd61c23b3c20e990c34edfa5b257f558d479218cf':
  TetheringSetting: Keep Tethering checkbox unchecked until tethering up
 2012-08-17 08:55:51 -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
The Android Open Source Project
c8cd7d9335 am 8543723f: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '8543723f37f6f8c42562e13d0ecaeeaa3a2d3e41':
 2012-08-16 18:59:04 -07:00
The Android Open Source Project
8543723f37 Reconcile with jb-mr0-release - do not merge 
Change-Id: Ie2c8260df9e0ee2206448b14f61be060206c22ba
 2012-08-16 18:57:02 -07:00
The Android Automerger
7a6674d1b1 merge in jb-mr0-release history after reset to jb-dev 2012-08-16 17:57:52 -07:00
Baligh Uddin
61ddf10d63 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-16 15:01:28 -07:00
Baligh Uddin
77fd1d9431 Import translations. DO NOT MERGE 
Change-Id: Ia37da41da85a756cb59799c52efadf5289eeacf3
Auto-generated-cl: translation import
 2012-08-16 14:46:47 -07:00
Dianne Hackborn
bb06a427eb Rename UserId to UserHandle. 
Change-Id: I04b86f3777c28fb83f03eb404dd5c2eb18d3da8f
 2012-08-16 12:47:09 -07: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
Baligh Uddin
704ca026e0 Import translations. DO NOT MERGE 
Change-Id: I72f08740932429c34f14ca0a16b2d330e8161e26
Auto-generated-cl: translation import
 2012-08-15 17:06:43 -07:00
Jeff Brown
0a5f02a736 Merge "Use new power manager API." into jb-mr1-dev 2012-08-15 10:27:02 -07:00
Baligh Uddin
9056ce4ed2 am 8ddcdbd4: (-s ours) am 11665038: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '8ddcdbd494298eb5198643600fb1f8693b618995':
  Import translations. DO NOT MERGE
 2012-08-15 07:59:00 -07:00
Baligh Uddin
8ddcdbd494 am 11665038: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '1166503886e834f74953bfdb6f0ee54d6c834249':
  Import translations. DO NOT MERGE
 2012-08-15 07:56:52 -07:00
Baligh Uddin
1166503886 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-08-15 07:54:44 -07:00
Baligh Uddin
abb27e66f4 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-15 07:48:35 -07:00
Baligh Uddin
28ff6bf63f Import translations. DO NOT MERGE 
Change-Id: If631ddac7c81a880ca6a1c6ddb7b38ff25d9bb2c
Auto-generated-cl: translation import
 2012-08-14 21:53:00 -07:00
Baligh Uddin
ba60a45ae7 Import translations. DO NOT MERGE 
Change-Id: Iec7b8dc92746f9c0449588e191cfa5920f112c19
Auto-generated-cl: translation import
 2012-08-14 21:51:07 -07:00
Brian Muramatsu
0bd54a65d6 display wireless charging status 
- show "Charging (wireless)" when using wireless charger
- change "Discharging" to "Not charging"

bug: 6879638

Change-Id: I20e78f2bde7a526667510b82a030f5952d9dda75
 2012-08-14 15:30:22 -07:00
Jeff Brown
748ba16a04 Use new power manager API. 
Change-Id: If0c58a9bee05ec0de434879e78cd95299e54e3fe
 2012-08-14 14:38:12 -07:00
Baligh Uddin
e62c9069f6 am 05e16515: (-s ours) am cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '05e16515399192130b738446a6c38374cf65e85b':
  Import translations. DO NOT MERGE
 2012-08-14 13:11:58 -07:00
Baligh Uddin
05e1651539 am cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'cb5624b80673e74f26d052f792dc8c9ce6e09a95':
  Import translations. DO NOT MERGE
 2012-08-14 13:09:11 -07:00
Baligh Uddin
cb5624b806 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-08-14 13:05:19 -07:00
Baligh Uddin
30e671bfc9 am 133c8ca5: (-s ours) am c5acc132: Import translations. DO NOT MERGE 
* commit '133c8ca599315c60bc8b30a4ac2020ceee02fc8e':
  Import translations. DO NOT MERGE
 2012-08-14 12:56:06 -07:00
Baligh Uddin
133c8ca599 am c5acc132: Import translations. DO NOT MERGE 
* commit 'c5acc132ca3de71c36cca1ebea2635396172ab4a':
  Import translations. DO NOT MERGE
 2012-08-14 12:55:11 -07:00
Baligh Uddin
d97aad10be Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-14 12:49:35 -07:00
Baligh Uddin
4e29964428 Import translations. DO NOT MERGE 
Change-Id: I6675ea178a94e2a8b185f3cc5900e96de4f61c3d
Auto-generated-cl: translation import
 2012-08-14 12:48:45 -07:00
Baligh Uddin
c5acc132ca Import translations. DO NOT MERGE 
Change-Id: Iba3c413c6b912f21e0529b16159abf4e4427b14b
Auto-generated-cl: translation import
 2012-08-14 12:45:33 -07:00
Jean-Baptiste Queru
b1f962377e am 291389ed: am 5dbc1f64: Merge "Fix use of holo drawables in a few more places" 
* commit '291389ed5ce3c97c7f5ec145f00a6bc68862f8f4':
  Fix use of holo drawables in a few more places
 2012-08-14 08:41:17 -07:00
Jean-Baptiste Queru
291389ed5c am 5dbc1f64: Merge "Fix use of holo drawables in a few more places" 
* commit '5dbc1f6405c909d6b6ba2da03e5b5fe8b417d1ba':
  Fix use of holo drawables in a few more places
 2012-08-14 08:39:24 -07:00
Przemyslaw Szczepaniak
ccd80ec95f Fix for setting TTS language to recently downloaded one 
If user added new voice pack, then set it as a default language,
went level back and went to TTS settings again, it ended in crash.

This is because first updateVoiceDetails uses old voice data details
that settings retreived long time ago.

locales preference is hidden until TTs engine returns list of locales.

Change-Id: I33a81ff259c69adb4c051ee693b6c41b93f302d0
 2012-08-14 08:29:05 -07: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
1c7d15e841 am 865a914f: am 42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card in landscape" 
* commit '865a914fb5459dd5d6d676b11a09c95d15f2ef6e':
  Fix the issue the setting crashes after unmount SD card in landscape
 2012-08-13 16:03:23 -07:00
Jeff Sharkey
d47a0d6c51 am 677e2ff6: am d7db6baa: Merge "Don\'t direct to market if no markets installed" 
* commit '677e2ff670eb48adf252e1bb9d1e2e5b3af558ee':
  Don't direct to market if no markets installed
 2012-08-13 16:03:22 -07:00
Jean-Baptiste Queru
9e8e9a1783 am 6fb425e2: am eefa61ed: Merge "Settings: Use ICS alert drawable" 
* commit '6fb425e2805a1c27c048fc954d402f4612cbf74d':
  Settings: Use ICS alert drawable
 2012-08-13 16:03:15 -07:00
Jeff Sharkey
865a914fb5 am 42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card in landscape" 
* commit '42eb3fb2584b61aa27a4f89dd06817162f69fb3c':
  Fix the issue the setting crashes after unmount SD card in landscape
 2012-08-13 14:11:01 -07:00
Jeff Sharkey
677e2ff670 am d7db6baa: Merge "Don\'t direct to market if no markets installed" 
* commit 'd7db6baac7e7d6742916cf1f80e9cbf832b1c64d':
  Don't direct to market if no markets installed
 2012-08-13 14:11:00 -07:00
Baligh Uddin
70372dcfc3 Import translations. DO NOT MERGE 
Change-Id: I98801e0b6cf3096a394a367ed93b49a2f7f851dc
Auto-generated-cl: translation import
 2012-08-13 13:27:25 -07:00
Baligh Uddin
059b123cb9 Import translations. DO NOT MERGE 
Change-Id: I7921607b000389e13db13a4a6e0b0014ec1e87a1
Auto-generated-cl: translation import
 2012-08-13 13:24:26 -07: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