Baligh Uddin
2c705626e5
am d4e216bc: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
...
* commit 'd4e216bc9eb9b8aecd031a5f3c2a412857333a99':
Revert "Import translations. DO NOT MERGE"
2012-09-06 11:17:39 -07:00
Baligh Uddin
c4e8757cd9
Merge "Revert "Import translations. DO NOT MERGE""
2012-09-06 11:16:32 -07:00
Baligh Uddin
d4e216bc9e
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
2012-09-06 11:16:17 -07:00
Baligh Uddin
13cfa44980
Revert "Import translations. DO NOT MERGE"
...
Broke the build.
This reverts commit d08dce4e69
2012-09-06 11:16:03 -07:00
Baligh Uddin
cbc213e54c
Revert "Import translations. DO NOT MERGE"
...
Broke the build.
This reverts commit 9dcb0727d0
2012-09-06 11:15:52 -07:00
Baligh Uddin
436c5421ad
am 237882f1: (-s ours) am d2dec8c7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '237882f1480aebe242dad3bae09a362a22a2e5a4':
Import translations. DO NOT MERGE
2012-09-06 10:57:48 -07:00
Baligh Uddin
237882f148
am d2dec8c7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'd2dec8c70eb8f745425c09070069ef52d306b233':
Import translations. DO NOT MERGE
2012-09-06 10:55:40 -07:00
Baligh Uddin
d2dec8c70e
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-06 10:53:13 -07:00
Baligh Uddin
c3967b9c29
Merge "Import translations. DO NOT MERGE"
2012-09-06 10:51:58 -07:00
The Android Open Source Project
f0f79b5ac5
am daed50bd: (-s ours) am 710aeba1: am c53ce268: (-s ours) Reconcile with jb-release - do not merge
...
* commit 'daed50bd1bd8351b852f4cd40bfe444074a5846e':
2012-09-06 09:16:31 -07:00
The Android Open Source Project
daed50bd1b
am 710aeba1: am c53ce268: (-s ours) Reconcile with jb-release - do not merge
...
* commit '710aeba1ce0bf2d121aaaf659284074750b43c6e':
2012-09-06 09:11:22 -07:00
The Android Open Source Project
710aeba1ce
am c53ce268: (-s ours) Reconcile with jb-release - do not merge
...
* commit 'c53ce26836eccfe9c0bb315d965bc73a9bd7b214':
2012-09-06 08:21:38 -07:00
The Android Open Source Project
fdca9c3fc6
am f3541a5f: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'f3541a5f0510c1d3f214358c0b7e06470c6d4b3b':
2012-09-06 08:20:51 -07:00
The Android Open Source Project
c53ce26836
Reconcile with jb-release - do not merge
...
Change-Id: I34fdfc427ea0fd0dc887303e7c019226a665f4de
2012-09-06 08:09:26 -07:00
The Android Open Source Project
f3541a5f05
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I9619964e59d6d3f9036372e67278498472f1d290
2012-09-06 07:54:52 -07:00
The Android Automerger
0d2e4cf041
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-06 06:34:42 -07:00
Charles Chen
23750fc423
am 5998c8ae: am ee04e472: Merge "Add content descriptions to power control widget." into jb-mr1-dev
...
* commit '5998c8ae243f5f84cd22ae283c5abd5373c436bd':
Add content descriptions to power control widget.
2012-09-05 17:17:43 -07:00
Charles Chen
5998c8ae24
am ee04e472: Merge "Add content descriptions to power control widget." into jb-mr1-dev
...
* commit 'ee04e47216ca947dfc781d1b4116f252dd2aa5a4':
Add content descriptions to power control widget.
2012-09-05 17:14:55 -07:00
Charles Chen
ee04e47216
Merge "Add content descriptions to power control widget." into jb-mr1-dev
2012-09-05 17:13:24 -07:00
Baligh Uddin
d08dce4e69
Import translations. DO NOT MERGE
...
Change-Id: Iaad0437ec086a52ec61bea09e31f60884d72c211
Auto-generated-cl: translation import
2012-09-05 14:05:16 -07:00
Baligh Uddin
9dcb0727d0
Import translations. DO NOT MERGE
...
Change-Id: If5b1608924c422e97c0a12ff0a41f0ade35b2822
Auto-generated-cl: translation import
2012-09-05 14:02:53 -07:00
John Spurlock
84b87d0d96
am fb2a89c6: am 1537e8b3: Dream settings: list items back to constant height
...
* commit 'fb2a89c686ffe8b37cd90359987505e5425e2ffe':
Dream settings: list items back to constant height
2012-09-05 08:01:01 -07:00
John Spurlock
fb2a89c686
am 1537e8b3: Dream settings: list items back to constant height
...
* commit '1537e8b3e8d81bf404f6aa70c8ca514f3ff62dd5':
Dream settings: list items back to constant height
2012-09-05 07:59:19 -07:00
John Spurlock
1537e8b3e8
Dream settings: list items back to constant height
...
Expanding/collapsing items removed, settings icon shown on right
with divider if applicable.
New "Start" action on the action bar to start dreaming. This is
no longer in preview/test mode, but a call to .dream().
Bug: 7010260
Change-Id: Ia1d8b9a70218dcc598bf62befbf545f572bbc6b1
2012-09-05 10:28:49 -04:00
The Android Automerger
64858b8f31
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-05 06:34:36 -07:00
Matthew Xie
1e1e15b59d
am 0aeb8f2e: am 952146ee: Merge "Clear profile connnection status of bonded devices when BT is turned off" into jb-mr1-dev
...
* commit '0aeb8f2ee1fcdaaf624e38a4abef47a1a5909b95':
Clear profile connnection status of bonded devices when BT is turned off
2012-09-04 15:34:23 -07:00
Matthew Xie
0aeb8f2ee1
am 952146ee: Merge "Clear profile connnection status of bonded devices when BT is turned off" into jb-mr1-dev
...
* commit '952146ee8f13ea87a890e3e4f7726fe49b60fc3d':
Clear profile connnection status of bonded devices when BT is turned off
2012-09-04 15:32:28 -07:00
Matthew Xie
952146ee8f
Merge "Clear profile connnection status of bonded devices when BT is turned off" into jb-mr1-dev
2012-09-04 15:31:04 -07:00
Ganesh Ganapathi Batta
7951b43bd9
Clear profile connnection status of bonded devices when BT is turned off
...
When BT is turned off in mid of a profile connection, sometimes
profile connection status change message with status= DISCONNECTED
does not reach Settings app which results in stale connection status
for the device when BT is enabled next time. Fixed the issue
By explicitly clearing the connection status for all paired devices
when BT is turning OFF
Change-Id: I5d0c158636f3b62eff9094821abe2ef3a7cab16e
2012-09-04 15:18:25 -07:00
The Android Automerger
89fe8cb0eb
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-04 06:33:28 -07:00
Przemyslaw Szczepaniak
e1d076a890
am 6b329db9: am 22dc1fe2: Make TTS languages list sorted.
...
* commit '6b329db9ebc04f94f5b1a3cd7f612c1cc699fae4':
Make TTS languages list sorted.
2012-09-03 08:12:07 -07:00
Przemyslaw Szczepaniak
6b329db9eb
am 22dc1fe2: Make TTS languages list sorted.
...
* commit '22dc1fe2bae886b385ddc22ee4f2819e5764c71a':
Make TTS languages list sorted.
2012-09-03 08:10:32 -07:00
Przemyslaw Szczepaniak
22dc1fe2ba
Make TTS languages list sorted.
...
Also makes sure that languages list always have underlying array after onCreate.
Bug: 5640782
Change-Id: Id85d0099efccc9a64458d24853b5c98a35307b38
2012-09-03 15:51:34 +01:00
The Android Automerger
53afda3b15
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-03 06:34:43 -07:00
Baligh Uddin
50b05ad801
Merge "Import translations. DO NOT MERGE"
2012-08-31 10:28:16 -07:00
Baligh Uddin
0e62d10347
Import translations. DO NOT MERGE
...
Change-Id: Iba535ca4a6090d6c3b9e4a270323f4af52ae611b
Auto-generated-cl: translation import
2012-08-31 09:33:10 -07:00
Jean-Baptiste Queru
bb7b462bb9
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 38136be4a3
2012-08-31 07:40:33 -07:00
Mathias Agopian
49ca847653
am 66514b78: (-s ours) am c888555f: FIX BUILD (DO NOT MERGE)
...
* commit '66514b7899eb2744d51b0f1463f4e2aa98da7eed':
FIX BUILD (DO NOT MERGE)
2012-08-31 02:29:26 -07:00
Mathias Agopian
66514b7899
am c888555f: FIX BUILD (DO NOT MERGE)
...
* commit 'c888555f8907328a8625cb2301e081fcd143f2c5':
FIX BUILD (DO NOT MERGE)
2012-08-31 02:27:07 -07:00
Mathias Agopian
c888555f89
FIX BUILD (DO NOT MERGE)
...
Revert "Import translations. DO NOT MERGE"
This reverts commit b3e78cc41f
2012-08-31 02:23:24 -07:00
Baligh Uddin
896f3cff80
am 968a7be2: (-s ours) am f9e25e83: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '968a7be25e0f6d13d92d38694ea5df8209aa1e05':
Import translations. DO NOT MERGE
2012-08-30 22:15:27 -07:00
Baligh Uddin
968a7be25e
am f9e25e83: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'f9e25e833f3bed04ebdb6481176584dfe3691088':
Import translations. DO NOT MERGE
2012-08-30 22:12:24 -07:00
Baligh Uddin
f9e25e833f
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-30 22:10:16 -07:00
Baligh Uddin
6b70d5e262
Merge "Import translations. DO NOT MERGE"
2012-08-30 22:09:45 -07:00
Amith Yamasani
9959460822
am 1a3b2c00: am 788cde4c: Rename settings title for user management screen
...
* commit '1a3b2c00eb43f9d737b85eed04a4ea6547b7ba4a':
Rename settings title for user management screen
2012-08-30 17:31:40 -07:00
Amith Yamasani
1a3b2c00eb
am 788cde4c: Rename settings title for user management screen
...
* commit '788cde4ce41ec633056c9c2b1360826ad72cda40':
Rename settings title for user management screen
2012-08-30 17:28:53 -07:00
Amith Yamasani
788cde4ce4
Rename settings title for user management screen
...
Change-Id: I0a57d52eb0c4e4fb8a8ab1449b98751927da2519
2012-08-30 17:25:20 -07:00
alanv
b9062f2678
Add content descriptions to power control widget.
...
Bug: 6361285
Change-Id: I4fd7ed519de9a5b7e50e6905550695fad02bcc42
2012-08-30 17:08:01 -07:00
Jeff Sharkey
2fe7079eb6
am 821ee347: am 037df2cb: Merge "Surface storage usage of other users." into jb-mr1-dev
...
* commit '821ee3476aeb8cba856d78df2a776d0876be42f0':
Surface storage usage of other users.
2012-08-30 15:30:22 -07:00
Jeff Sharkey
821ee3476a
am 037df2cb: Merge "Surface storage usage of other users." into jb-mr1-dev
...
* commit '037df2cb182edb3070080625031073d30abfc56a':
Surface storage usage of other users.
2012-08-30 15:28:39 -07:00
