Commit Graph

8318 Commits

Author SHA1 Message Date
Baligh Uddin
abb27e66f4 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-15 07:48:35 -07:00
Baligh Uddin
61ada8dab2 Merge "Import translations. DO NOT MERGE" 2012-08-15 07:46:00 -07:00
The Android Automerger
5532aa6efd merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-15 06:34:56 -07:00
Baligh Uddin
a3ea6a38e0 Import translations. DO NOT MERGE
Change-Id: I7c04327691d80c32adc4c7e9a5321be4ca53af68
Auto-generated-cl: translation import
2012-08-14 21:55:20 -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
e7a5496569 am a1754194: (-s ours) am e62c9069: am 05e16515: (-s ours) am cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'a17541940f6e6169956b8be3bf191eec06a8285d':
  Import translations. DO NOT MERGE
2012-08-14 13:15:59 -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
950ca7cf61 am b3fab016: (-s ours) am 30e671bf: am 133c8ca5: (-s ours) am c5acc132: Import translations. DO NOT MERGE
* commit 'b3fab0161b426716a2ac8a2e464923d46053eb00':
  Import translations. DO NOT MERGE
2012-08-14 12:58:11 -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
cf5ca26646 am da5bb392: (-s ours) am d97aad10: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'da5bb3929dcb224388f30c7d51aad7f0eea0a5d0':
  Import translations. DO NOT MERGE
2012-08-14 12:53:14 -07:00
Baligh Uddin
575754fbf3 Merge "Import translations. DO NOT MERGE" 2012-08-14 12:52:38 -07:00
Baligh Uddin
7e21a406bb Import translations. DO NOT MERGE
Change-Id: Ie305c33357a02ceb764477432909762f0eacec02
Auto-generated-cl: translation import
2012-08-14 12:52:20 -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
1b4a1b0903 am f07797d8: am b1f96237: am 291389ed: am 5dbc1f64: Merge "Fix use of holo drawables in a few more places"
* commit 'f07797d858abc701cce541f2a66761123b21b554':
  Fix use of holo drawables in a few more places
2012-08-14 08:45:09 -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
178eba477d am 72529f17: am ccd80ec9: Fix for setting TTS language to recently downloaded one
* commit '72529f179b6ba1c0f0430f31d97dd4fedbbfbb11':
  Fix for setting TTS language to recently downloaded one
2012-08-14 08:33:56 -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
ceb001a728 am adfa7fb2: am 1c7d15e8: am 865a914f: am 42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card in landscape"
* commit 'adfa7fb2a70f459de53a72b3c3ace9aee0a781c6':
  Fix the issue the setting crashes after unmount SD card in landscape
2012-08-13 16:10:26 -07:00
Jeff Sharkey
a63549ddce am 03bec5dc: am d47a0d6c: am 677e2ff6: am d7db6baa: Merge "Don\'t direct to market if no markets installed"
* commit '03bec5dc1e1f236c33728ddc4ca42737c0a44f78':
  Don't direct to market if no markets installed
2012-08-13 16:10:24 -07:00
Jean-Baptiste Queru
c3b7086802 am 463b501e: am 9e8e9a17: am 6fb425e2: am eefa61ed: Merge "Settings: Use ICS alert drawable"
* commit '463b501e6c50fb2312e83b520147af41b253dd8f':
  Settings: Use ICS alert drawable
2012-08-13 16:10:23 -07: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
d6cdaebe69 am dd7857e2: (-s ours) am 70372dcf: Import translations. DO NOT MERGE
* commit 'dd7857e28f7f066d7e92e42ab607db612b5fc123':
  Import translations. DO NOT MERGE
2012-08-13 15:49:23 -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
e5bdab3775 Import translations. DO NOT MERGE
Change-Id: I57cc82b205973c1de47c4d488742d799606dad02
Auto-generated-cl: translation import
2012-08-13 13:30:49 -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