Commit Graph

6985 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
d61c23b3c2 Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up" 2012-08-17 08:51:14 -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
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
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
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
Brian Muramatsu
1f1b9abd00 am beb3d8b1: Merge "Fix Settings NPE" into jb-dev
* commit 'beb3d8b1e06f26c20adc4d4db7a08ac507ad6ab0':
  Fix Settings NPE
2012-06-28 16:56:29 -07:00
Brian Muramatsu
beb3d8b1e0 Merge "Fix Settings NPE" into jb-dev 2012-06-28 16:53:47 -07:00
Eric Fischer
c70bec4454 am 3cc385b8: Import translations. DO NOT MERGE
* commit '3cc385b83ca0f2c5e7a6b8464604ec3eb613f235':
  Import translations. DO NOT MERGE
2012-06-28 14:27:32 -07:00
Brian Muramatsu
c28af52e59 Fix Settings NPE
Labels for account types can be null which causes a NPE to occur in
Settings. If the label is null, don't bother adding an account
header. If we don't do this, then it would blow up when trying to
sort the headers anyway, so this change will fix the crash.

Bug 6727947

Change-Id: I284d7204b6d21c8d1b0a36e18ecae2c2361eeb84
2012-06-28 14:25:14 -07:00
Eric Fischer
3cc385b83c Import translations. DO NOT MERGE
Change-Id: If4dd46dc84b974aabefe57aefb43de4329396c51
Auto-generated-cl: translation import
2012-06-28 12:51:19 -07:00
The Android Automerger
aa6707ae41 merge in jb-release history after reset to jb-dev 2012-06-28 07:04:34 -07:00
Ying Wang
ebf032dff9 am c812fe4c: Import translations. DO NOT MERGE
* commit 'c812fe4c0e989fcea906a6dda7c88a55076cd50d':
  Import translations. DO NOT MERGE
2012-06-27 17:21:34 -07:00
Ying Wang
c812fe4c0e Import translations. DO NOT MERGE
Change-Id: I5c769ea97c25696684c6818bfb84c95d30689b22
2012-06-27 16:19:29 -07:00
The Android Automerger
fa7c79892a merge in jb-release history after reset to jb-dev 2012-06-26 11:11:58 -07:00
Jake Hamby
8f12b1287f am f59dd9d6: Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev
* commit 'f59dd9d67e269a81c684ecd641e514aba8d2330a':
  Add menu item to Settings to go to Cell Broadcast settings.
2012-06-25 16:21:18 -07:00
Jake Hamby
f59dd9d67e Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev 2012-06-25 16:19:23 -07:00
Eric Fischer
b12cc8107d am 40b78280: Import translations. DO NOT MERGE
* commit '40b78280eb0c93d9ee3918813cfabf93a2919f35':
  Import translations. DO NOT MERGE
2012-06-25 13:34:20 -07:00
Jake Hamby
ef57ed71bf Add menu item to Settings to go to Cell Broadcast settings.
Add menu item to Settings when "config_cellBroadcastAppLinks"
config option is set to true to jump to the Cell Broadcast app
settings activity. This enables the Cell Broadcast launcher
icon to be removed, while still allowing access to the app
(by adding a similar menu item to the MMS app) and its settings
activity (this settings link).

The menu item will not be added if the CellBroadcastReceiver
package is disabled or not installed.

Bug: 6709985
Change-Id: If3a3016ceea70704790964c0b712c31cb38f7b62
2012-06-25 13:20:45 -07:00
Eric Fischer
40b78280eb Import translations. DO NOT MERGE
Change-Id: Ic94e1bba24f847df6b65c46539bb2de12e8ab38b
2012-06-25 13:00:04 -07:00
The Android Open Source Project
a5581a1b6a Reconcile with jb-release
Change-Id: Ib43ec64c9827ceb6956e4f86dcc9439e8a433e16
2012-06-25 07:57:38 -07:00
Ying Wang
7a1a575b74 am d7e8025f: Import translations. DO NOT MERGE
* commit 'd7e8025fdf91fd0a6dad9df6bc92e7cb9d7566c2':
  Import translations. DO NOT MERGE
2012-06-23 05:36:47 -07:00
The Android Automerger
bfbcf0904d merge in jb-release history after reset to jb-dev 2012-06-22 20:38:33 -07:00
Ying Wang
d7e8025fdf Import translations. DO NOT MERGE
Change-Id: I417b1bbfd809569e110d5534fb2db1dd2c82075e
2012-06-22 15:07:41 -07:00
The Android Open Source Project
d88734ab4d Reconcile with jb-release
Change-Id: I7cd948231f3aa78f5d0a53889ed833af50738452
2012-06-22 08:17:21 -07:00
The Android Automerger
a99fd92072 merge in jb-release history after reset to jb-dev 2012-06-21 17:52:47 -07:00