Commit Graph

7700 Commits

Author SHA1 Message Date
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
a17541940f am e62c9069: am 05e16515: (-s ours) am cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'e62c9069f6878cb23e7b2860e3f3ec67d47ad2e9':
  Import translations. DO NOT MERGE
2012-08-14 13:13:31 -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
b3fab0161b am 30e671bf: am 133c8ca5: (-s ours) am c5acc132: Import translations. DO NOT MERGE
* commit '30e671bfc9ffbfe1a00bf7be6cece5e0e7830b64':
  Import translations. DO NOT MERGE
2012-08-14 12:57:04 -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
da5bb3929d am d97aad10: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'd97aad10be86e151832b759ead28fffc4d8aa2fa':
  Import translations. DO NOT MERGE
2012-08-14 12:50:53 -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
f07797d858 am b1f96237: am 291389ed: am 5dbc1f64: Merge "Fix use of holo drawables in a few more places"
* commit 'b1f962377ec58f4e6dae3a7795d9113ed7306667':
  Fix use of holo drawables in a few more places
2012-08-14 08:43:14 -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
72529f179b am ccd80ec9: Fix for setting TTS language to recently downloaded one
* commit 'ccd80ec95f035cb9db9775e6f86fea1f7809f168':
  Fix for setting TTS language to recently downloaded one
2012-08-14 08:31:53 -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
The Android Automerger
ee940101d4 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-14 07:07:54 -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
adfa7fb2a7 am 1c7d15e8: am 865a914f: am 42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card in landscape"
* commit '1c7d15e841a03a62c5c89f514970a8ce14069c2f':
  Fix the issue the setting crashes after unmount SD card in landscape
2012-08-13 16:07:40 -07:00
Jeff Sharkey
03bec5dc1e am d47a0d6c: am 677e2ff6: am d7db6baa: Merge "Don\'t direct to market if no markets installed"
* commit 'd47a0d6c51cc8529f7e4e7bfcbb4de139e339941':
  Don't direct to market if no markets installed
2012-08-13 16:07:39 -07:00
Jean-Baptiste Queru
463b501e6c am 9e8e9a17: am 6fb425e2: am eefa61ed: Merge "Settings: Use ICS alert drawable"
* commit '9e8e9a17836654f041f8c032e4f9c88341a63d4e':
  Settings: Use ICS alert drawable
2012-08-13 16:07:37 -07: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
Baligh Uddin
dd7857e28f am 70372dcf: Import translations. DO NOT MERGE
* commit '70372dcfc382c78c41013fa4d9e4a8bdcc7838ae':
  Import translations. DO NOT MERGE
2012-08-13 15:46:48 -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
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
The Android Automerger
abcf9657c5 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-13 08:10:11 -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
Amith Yamasani
032aa5a5ba am 32630395: Use UserManager instead of PackageManager for user management
* commit '32630395eb7dd8401f344599640c8bcf1e289bb0':
  Use UserManager instead of PackageManager for user management
2012-08-11 21:57:51 -07:00
Amith Yamasani
32630395eb Use UserManager instead of PackageManager for user management
Show Accounts in secondary settings
Move Users & restrictions to Device section

Change-Id: Idcd7ed44801fe92c847cff81d11f3d6f6d06ba81
2012-08-10 19:53:29 -07:00
Baligh Uddin
424111dd2a am 5ef3293e: Import translations. DO NOT MERGE
* commit '5ef3293ed2bfd43e6a179121e6b562e56ced3feb':
  Import translations. DO NOT MERGE
2012-08-10 15:36:48 -07:00
Baligh Uddin
5ef3293ed2 Import translations. DO NOT MERGE
Change-Id: Ifc7f0f0796b3cd9b46dc913083ea38c146feb086
Auto-generated-cl: translation import
2012-08-10 11:21:05 -07:00
The Android Open Source Project
9698d3624c Reconcile with jb-mr1-release - do not merge
Change-Id: I73e4c2917ac2df4341096582c1a1d1eab7df8a66
2012-08-10 08:53:55 -07:00
Przemyslaw Szczepaniak
06649d02b2 am 923187a1: Keep speech rate dialog after rotate
* commit '923187a159cb0c192a2f978a6bf1dd51275ea916':
  Keep speech rate dialog after rotate
2012-08-10 07:17:36 -07:00
Przemyslaw Szczepaniak
923187a159 Keep speech rate dialog after rotate
It also adds some missing @Override

Bug: 5997716
Change-Id: I33a7b8ad16cd067af960a4808ae6003dde1d7693
2012-08-10 07:13:52 -07:00
Baligh Uddin
2dc3d55196 am 658f909d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '658f909d711b1598ec6f49447679569f0bc19c15':
  Import translations. DO NOT MERGE
2012-08-09 19:52:40 -07:00
Baligh Uddin
658f909d71 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-09 19:50:14 -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