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
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
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
9dcb0727d0
Import translations. DO NOT MERGE
...
Change-Id: If5b1608924c422e97c0a12ff0a41f0ade35b2822
Auto-generated-cl: translation import
2012-09-05 14:02:53 -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
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
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
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
.
Change-Id: Ifbff2b21c249dab09126b03a8cbbccde964781df
2012-08-31 02:23:24 -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
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
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
Jeff Sharkey
037df2cb18
Merge "Surface storage usage of other users." into jb-mr1-dev
2012-08-30 15:26:50 -07:00
Jeff Sharkey
90c8b20ccf
Surface storage usage of other users.
...
Bring up separate StorageMeasurement sessions bound to other users
on device, and surface their total usage as teal colors. Exclude
app code size when measuring secondary users. Shift preferences to
using keys instead of fragile index ordering.
Bug: 7003520
Change-Id: I214d0b223e53955df71104502596743f049f2027
2012-08-30 15:24:53 -07:00
John Spurlock
40db7c50fd
am 7af2aa52
: More traditional list item style for dreams settings.
...
* commit '7af2aa52ac2e458969abeaefec217f6a4f976767':
More traditional list item style for dreams settings.
2012-08-30 13:59:04 -07:00
John Spurlock
7af2aa52ac
More traditional list item style for dreams settings.
...
Other improvements:
- remove "Start dreaming now", promote "When to dream" to action bar
- added logging
- hide dream settings button if n/a
- new flat style for settings/preview + dividers
- refresh dreams list when packages are installed/uninstalled
- added placeholder for help url
Bug:7010260
Change-Id: Ia443b4f76678eaf1a52b907d50aefb0d8f7e4748
2012-08-30 16:28:29 -04:00
The Android Automerger
25d1a7d292
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-30 06:34:30 -07:00
Baligh Uddin
b3e78cc41f
Import translations. DO NOT MERGE
...
Change-Id: Ie33abb2dac44b49a64040688f9ffe7a1d7add9f3
Auto-generated-cl: translation import
2012-08-29 20:17:20 -07:00
John Spurlock
79bd0a7555
am 2dff5b10
: Merge "New dream settings - first cut" into jb-mr1-dev
...
* commit '2dff5b109b9dd4b55cb64d89ff55c56318052b5c':
New dream settings - first cut
2012-08-29 15:57:54 -07:00
John Spurlock
2dff5b109b
Merge "New dream settings - first cut" into jb-mr1-dev
2012-08-29 15:55:25 -07:00
Jeff Brown
b519a1268e
am b2b54eec
: Add new setting to control overlay displays.
...
* commit 'b2b54eec86bc5b5830e4480407cbd1fccfd21256':
Add new setting to control overlay displays.
2012-08-29 15:46:43 -07:00
The Android Automerger
9f1ebc2272
merge in jb-release history after reset to jb-dev
2012-08-29 14:29:55 -07:00
John Spurlock
6df18e2713
New dream settings - first cut
...
First draft implementation of mocks for dream settings.
Want to merge for the weekly build, so a few things remain, namely:
- flat style for preview/settings buttons + dividers
- animation between dream row expanded/collapsed state
- wire up the help url
- possibly ditch the non-standard style
- add logging
- refresh when packages are installed/uninstalled
Bug:7010260
Change-Id: I96e3ab944170925bd76edf7b8b1127adfffc6262
2012-08-29 16:41:01 -04:00
The Android Automerger
49c743c864
merge in jb-release history after reset to jb-dev
2012-08-29 12:43:12 -07:00
The Android Automerger
ad987fec9a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-29 06:34:22 -07:00
Jeff Brown
b2b54eec86
Add new setting to control overlay displays.
...
Change-Id: I9582bb149dca716699ef5977ef8f84bb3136e0c0
2012-08-29 06:15:23 -07:00
Baligh Uddin
c07c70bea2
am c6015d2f
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c6015d2f593d0e5ef909d7157df4b15831236acb':
Import translations. DO NOT MERGE
2012-08-28 15:16:40 -07:00
Baligh Uddin
c6015d2f59
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-28 15:15:09 -07:00
Nick Kralevich
6172006184
am 7e7912de
: ChooseLockPassword: allow spaces in passwords
...
* commit '7e7912de4fb44481ded8e17d5ac1d7a1c9a0d184':
ChooseLockPassword: allow spaces in passwords
2012-08-28 15:13:33 -07:00
Baligh Uddin
54762ab2bc
Import translations. DO NOT MERGE
...
Change-Id: I884b6bb2bd0045049a7578235563896afe9414a7
Auto-generated-cl: translation import
2012-08-28 14:29:09 -07:00
Nick Kralevich
7e7912de4f
ChooseLockPassword: allow spaces in passwords
...
This fixes http://code.google.com/p/android/issues/detail?id=35988
Change-Id: I1880d7e41028f034e75a048226cce3bf96845a09
2012-08-28 13:41:37 -07:00
Wink Saville
e07b883a1a
am ca786f39
: am c5fc6231
: am 2d6b52bd
: Merge "Fix memory leak in ApnSettings-activity"
...
* commit 'ca786f3989c93ac1c368151c1cede7b47fc10711':
Fix memory leak in ApnSettings-activity
2012-08-28 12:21:04 -07:00
Wink Saville
ca786f3989
am c5fc6231
: am 2d6b52bd
: Merge "Fix memory leak in ApnSettings-activity"
...
* commit 'c5fc6231312b21efb601367bae28d63f9b26ac52':
Fix memory leak in ApnSettings-activity
2012-08-28 12:18:57 -07:00
Wink Saville
c5fc623131
am 2d6b52bd
: Merge "Fix memory leak in ApnSettings-activity"
...
* commit '2d6b52bd38046abe1761cf0cc1f0c415e4a24fef':
Fix memory leak in ApnSettings-activity
2012-08-28 12:13:59 -07:00
Wink Saville
2d6b52bd38
Merge "Fix memory leak in ApnSettings-activity"
2012-08-28 12:01:29 -07:00
Jean-Baptiste Queru
9b4d7aee4f
am 72d3f85d
: am 300457ba
: am 38ce5194
: Merge "Enable to delete a stored persistent group from p2p settings."
...
* commit '72d3f85d09fd900004956b60e7e93997ba8b1025':
Enable to delete a stored persistent group from p2p settings.
2012-08-28 11:17:50 -07:00
Jean-Baptiste Queru
72d3f85d09
am 300457ba
: am 38ce5194
: Merge "Enable to delete a stored persistent group from p2p settings."
...
* commit '300457bad289f547430da21e72747e8840840832':
Enable to delete a stored persistent group from p2p settings.
2012-08-28 11:15:22 -07:00