Christopher Tate
7b2511260f
am 6c084141: Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev
...
* commit '6c0841412e3ddf03d7b9ad56e398a20f6b6cf3fd':
Update Settings app to manipulate now-global settings properly
2012-09-07 14:38:56 -07:00
Christopher Tate
6c0841412e
Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev
2012-09-07 14:37:03 -07:00
Christopher Tate
5a64c739bf
Update Settings app to manipulate now-global settings properly
...
Change-Id: I6c269051c7d2db87f70f44df74e06456588c3b6f
2012-09-07 13:35:31 -07:00
Jeff Sharkey
20ec00d3e8
am 04df8b77: Iteration on multi-user storage UI.
...
* commit '04df8b77a40c06488a954a22cc5be638179b7747':
Iteration on multi-user storage UI.
2012-09-07 13:26:56 -07:00
Jeff Sharkey
04df8b77a4
Iteration on multi-user storage UI.
...
Adds headers to distinguish between current and other users. Also
correctly orders color chips.
Bug: 7003520
Change-Id: I871f1a38d41dad5a5f7d97d91d2ebaac5951066c
2012-09-07 13:23:55 -07:00
Jeff Sharkey
e8d2ae5f17
am 96c2f8c5: Progress towards split storage categories.
...
* commit '96c2f8c50865e823e710be4d92f1589f978f03c2':
Progress towards split storage categories.
2012-09-06 23:24:53 -07:00
Jeff Sharkey
96c2f8c508
Progress towards split storage categories.
...
Cleans up StorageVolumePreferenceCategory creation, and uses new
isPrimary() API instead of passing around hacky "i == 0" derived
value.
Bug: 7003520
Change-Id: I9eb7164035b5368ee795e35b22e750aebbf3b159
2012-09-06 23:21:09 -07:00
Elliott Hughes
07e5c69010
am 88220b72: am 4ad02d02: am a76ba7bb: am cfbc61de: Merge "Stop using getDSTSavings."
...
* commit '88220b72044392f0cbfecb24c84e6a63e82be25c':
Stop using getDSTSavings.
2012-09-06 16:43:26 -07:00
Elliott Hughes
0c0d605231
am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
...
* commit '105d879ccef2517a07a15f29b956be739504fa73':
Stop hard-coding sample 12- and 24-hour times.
2012-09-06 16:41:35 -07:00
Elliott Hughes
88220b7204
am 4ad02d02: am a76ba7bb: am cfbc61de: Merge "Stop using getDSTSavings."
...
* commit '4ad02d02b8a27c627eace2bdf1fe8e0b3cfe08fb':
Stop using getDSTSavings.
2012-09-06 16:41:16 -07:00
Elliott Hughes
4ad02d02b8
am a76ba7bb: am cfbc61de: Merge "Stop using getDSTSavings."
...
* commit 'a76ba7bb301e2349541ddeeb492d3bf4f6e6b70c':
Stop using getDSTSavings.
2012-09-06 16:40:09 -07:00
Elliott Hughes
105d879cce
am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
...
* commit '98d9380a5c3c6a6bfa5687af993ea43c882226b9':
Stop hard-coding sample 12- and 24-hour times.
2012-09-06 16:39:41 -07:00
Elliott Hughes
a76ba7bb30
am cfbc61de: Merge "Stop using getDSTSavings."
...
* commit 'cfbc61de3f94a620153ca83a790e4d1b03a9078e':
Stop using getDSTSavings.
2012-09-06 16:38:37 -07:00
Elliott Hughes
98d9380a5c
am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
...
* commit '680c8c8e43804d9bf69568d4748b3bd3a4aea0ee':
Stop hard-coding sample 12- and 24-hour times.
2012-09-06 16:37:44 -07:00
Elliott Hughes
680c8c8e43
resolved conflicts for merge of 33f86196 to stage-aosp-master
...
Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
2012-09-06 16:09:04 -07:00
Elliott Hughes
cfbc61de3f
Merge "Stop using getDSTSavings."
2012-09-06 15:50:10 -07:00
Elliott Hughes
6c7f55ee4b
Stop using getDSTSavings.
...
The original code was actually correct, but code calling inDaylightTime
and getDSTSavings directly is inherently suspect, so I want to clean up
this false positive along with the real abusers.
Bug: 6901488
Change-Id: I6c89e7aa29d88b81ed2c7fd6c915e0346b90a442
2012-09-06 15:42:09 -07:00
Elliott Hughes
33f8619677
Merge "Stop hard-coding sample 12- and 24-hour times."
2012-09-06 15:29:47 -07:00
Elliott Hughes
82723df002
Stop hard-coding sample 12- and 24-hour times.
...
Bug: 6881640
Change-Id: I6b0d6404b0299f9efa8fd12779799f703f1c764f
2012-09-06 14:49:35 -07:00
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
d4e216bc9e
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
2012-09-06 11:16:17 -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
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
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
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
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
