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

7067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
ba60a45ae7 Import translations. DO NOT MERGE 
Change-Id: Iec7b8dc92746f9c0449588e191cfa5920f112c19
Auto-generated-cl: translation import
 2012-08-14 21:51:07 -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
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
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
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
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
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
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
Jeff Sharkey
d7db6baac7 Merge "Don't direct to market if no markets installed" 2012-08-13 13:14:08 -07:00
Jean-Baptiste Queru
6fb425e280 am eefa61ed: Merge "Settings: Use ICS alert drawable" 
* commit 'eefa61ed2e8583f659e868f3057f195d7cb2bb11':
  Settings: Use ICS alert drawable
 2012-08-13 12:02:26 -07:00
Jean-Baptiste Queru
eefa61ed2e Merge "Settings: Use ICS alert drawable" 2012-08-13 11:53:46 -07: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
Jean-Baptiste Queru
7526636406 am 5d72b272: Merge "Add support for SE Android to the Settings app." 
* commit '5d72b2726797374e402943182d8132045ed32d3a':
  Add support for SE Android to the Settings app.
 2012-08-08 14:04:11 -07:00
Jean-Baptiste Queru
5d72b27267 Merge "Add support for SE Android to the Settings app." 2012-08-08 13:19:26 -07:00
The Android Open Source Project
7e107a0903 Reconcile with jb-mr0-release - do not merge 
Change-Id: Iea656c0ea3a18a0a9874e271f18c8ebed540feb5
 2012-08-07 14:59:46 -07:00
The Android Automerger
9a85ed20ee merge in jb-mr0-release history after reset to jb-dev 2012-08-07 13:01:34 -07:00
Ying Wang
bdae7b0139 am 3eee86b8: Import translations. DO NOT MERGE 
* commit '3eee86b8d7bc175e1e83269afc5c2c5441681a50':
  Import translations. DO NOT MERGE
 2012-08-03 14:38:01 -07:00
Ying Wang
3eee86b8d7 Import translations. DO NOT MERGE 
Change-Id: Ia673ddc20188c59c8591015e51033a526a7151ab
Auto-generated-cl: translation import
 2012-08-03 13:41:54 -07:00
Michael Jurka
3d43f9c8aa am ca511a81: Fix appwidget bind dialog 
* commit 'ca511a8115962be7f598deb20aa47793db6d06f7':
  Fix appwidget bind dialog
 2012-08-02 22:29:23 -07:00
Michael Jurka
ca511a8115 Fix appwidget bind dialog 
Bug: 6926529
Change-Id: I19327a6346b6e7da61a49a983b3373058db21f12
 2012-08-02 18:36:42 -07:00
Ying Wang
91840c0236 am d7ae05db: Import translations. DO NOT MERGE 
* commit 'd7ae05dbdc1af637e7e6655abb1a6b63e9d49968':
  Import translations. DO NOT MERGE
 2012-08-01 15:28:32 -07:00
Ying Wang
d7ae05dbdc Import translations. DO NOT MERGE 
Change-Id: I581b48ef0f69e5bd2c469fd2ac61a8c5564bc553
Auto-generated-cl: translation import
 2012-08-01 14:13:16 -07:00
The Android Open Source Project
f6162c80cf Reconcile with jb-mr0-release - do not merge 
Change-Id: If5252c45f4163409ab8375e27cb13f3f06a237b6
 2012-07-31 14:48:53 -07:00
The Android Automerger
2e1cf2aa70 merge in jb-mr0-release history after reset to jb-dev 2012-07-31 14:07:44 -07:00
Ying Wang
9691c1e646 am 723bdf1e: Import translations. DO NOT MERGE 
* commit '723bdf1ec561d211b45f20546e6938e68feebf39':
  Import translations. DO NOT MERGE
 2012-07-30 15:06:58 -07:00
The Android Open Source Project
a62d789389 Reconcile with jb-mr0-release jb-release 
Change-Id: I1e66be92b8c13756b702c251c8b8f93bc8b07a83
 2012-07-30 14:44:42 -07:00
Ying Wang
723bdf1ec5 Import translations. DO NOT MERGE 
Change-Id: I6789871cb46bac62934f63182d2dacce3dda85e3
Auto-generated-cl: translation import
 2012-07-30 13:25:03 -07:00
Ying Wang
270a550341 am eaeb8b61: Import translations. DO NOT MERGE 
* commit 'eaeb8b61d630e40dfe3851eb2a5f3300f3b30abe':
  Import translations. DO NOT MERGE
 2012-07-27 15:46:02 -07:00
Ying Wang
eaeb8b61d6 Import translations. DO NOT MERGE 
Change-Id: Id5983c861a0f8d50f39517bae9271dba88c9e530
Auto-generated-cl: translation import
 2012-07-27 12:25:46 -07:00
The Android Automerger
85f947a77e merge in jb-mr0-release history after reset to jb-dev 2012-07-26 17:49:58 -07:00
Amith Yamasani
2d018a8b0d am 07841668: Merge "Move Google-apps specific location settings to a Google package" into jb-dev 
* commit '078416689807e49c8b6750b9e3cc8a0e9ca3a2a1':
  Move Google-apps specific location settings to a Google package
 2012-07-26 16:07:19 -07:00
Ying Wang
afc96c1b87 am 4e53a0cb: Import translations. DO NOT MERGE 
* commit '4e53a0cbdc56fce1a7fcf94c83d4a0f70ffd6920':
  Import translations. DO NOT MERGE
 2012-07-26 16:07:17 -07:00
Amith Yamasani
0784166898 Merge "Move Google-apps specific location settings to a Google package" into jb-dev 2012-07-26 16:05:19 -07:00
Ying Wang
4e53a0cbdc Import translations. DO NOT MERGE 
Change-Id: I278308a46da25f82ee3da787b628cf67df4b6f0b
Auto-generated-cl: translation import
 2012-07-26 15:11:52 -07:00
Amith Yamasani
8442db24a1 Move Google-apps specific location settings to a Google package 
Bug: 6882764

This removes the Google specific checkbox and adds a master toggle
for location providers which turns both providers on/off when
toggled.

Change-Id: I2a7af0953902bfd6f4b221725dc2d838bb3d0ce4
 2012-07-26 14:28:07 -07:00
Ying Wang
7021c6e6df am c31f6b23: Import translations. DO NOT MERGE 
* commit 'c31f6b23e400dc00fa69dddf575c33a06def0363':
  Import translations. DO NOT MERGE
 2012-07-25 15:06:15 -07:00