Commit Graph

7048 Commits

Author SHA1 Message Date
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
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
Ying Wang
c31f6b23e4 Import translations. DO NOT MERGE
Change-Id: I56c497673b39fb29801bc6f4bb71ec205ddc4d10
Auto-generated-cl: translation import
2012-07-25 14:17:08 -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
Ying Wang
5bc4bb204a am 54199540: Import translations. DO NOT MERGE
* commit '54199540b1d07af1a71e10ab096493245ed5fdbd':
  Import translations. DO NOT MERGE
2012-07-24 22:01:08 -07:00
The Android Automerger
8272edba7d merge in jb-release history after reset to jb-dev 2012-07-24 20:23:17 -07:00
The Android Automerger
a29723c7af merge in jb-mr0-release history after reset to jb-dev 2012-07-24 12:39:36 -07:00
Ying Wang
54199540b1 Import translations. DO NOT MERGE
Change-Id: Iaab1ba57ddc978edab0389c9172be39899d9bd24
Auto-generated-cl: translation import
2012-07-24 12:38:57 -07:00
Amith Yamasani
bebcc97685 am 4635ec6b: Strings for upcoming location settings changes.
* commit '4635ec6b8dcf9a9f686a4d25eaffe916f5dcd20e':
  Strings for upcoming location settings changes.
2012-07-23 18:49:45 -07:00
Amith Yamasani
4635ec6b8d Strings for upcoming location settings changes.
Adding these first to parallelize translations.

Change-Id: Ia0fcecd6d714ad58c45e5ddc9ae5f00afce3e810
2012-07-23 16:40:02 -07:00
Ying Wang
e3627120c3 am 13be5469: Import translations. DO NOT MERGE
* commit '13be54694f93172791bc342828594ede27919fc6':
  Import translations. DO NOT MERGE
2012-07-23 14:03:33 -07:00
Ying Wang
13be54694f Import translations. DO NOT MERGE
Change-Id: Idf81094651355da7433c69cefd2fddf0ccc0bc0a
Auto-generated-cl: translation import
2012-07-23 13:05:38 -07: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
Ying Wang
b602193318 am 509cfa1d: Import translations. DO NOT MERGE
* commit '509cfa1d5422e4b4f892bf4a8612f9548a7665bd':
  Import translations. DO NOT MERGE
2012-07-20 14:04:56 -07:00
Ying Wang
509cfa1d54 Import translations. DO NOT MERGE
Change-Id: Ic57f9912261e3b685eac931269bdac10353305d4
Auto-generated-cl: translation import
2012-07-20 12:53:45 -07:00
Ying Wang
fc8267abd5 am 35e404c8: Import translations. DO NOT MERGE
* commit '35e404c8f0236234cb75896f4d2b828bb60061aa':
  Import translations. DO NOT MERGE
2012-07-19 14:51:30 -07:00
Ying Wang
35e404c8f0 Import translations. DO NOT MERGE
Change-Id: I029b2b28210dbac2b523152441195db55c352120
Auto-generated-cl: translation import
2012-07-19 14:21:34 -07:00
The Android Open Source Project
5924943c91 Reconcile with jb-mr0-release jb-release
Change-Id: If4a370c83e39eea43d31edcc1554ec1aeb539505
2012-07-19 08:41:38 -07:00
The Android Automerger
0576f79dd8 merge in jb-release history after reset to jb-dev 2012-07-18 23:04:50 -07:00
The Android Automerger
e9c00b6a66 merge in jb-mr0-release history after reset to jb-dev 2012-07-18 21:44:53 -07:00
Ying Wang
4b7c4f1c12 am 2bc05a27: Import translations. DO NOT MERGE
* commit '2bc05a2726935df5a085c78f8c7b0cfcc78aea43':
  Import translations. DO NOT MERGE
2012-07-18 20:14:18 -07:00