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
7121c191dd
am e8d2ae5f: am 96c2f8c5: Progress towards split storage categories.
...
* commit 'e8d2ae5f175bdca0eedf44c0207740678102bb46':
Progress towards split storage categories.
2012-09-06 23:26:15 -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
a149c0879b
am 07e5c690: am 88220b72: am 4ad02d02: am a76ba7bb: am cfbc61de: Merge "Stop using getDSTSavings."
...
* commit '07e5c69010853c6c94cd27ac2c92516b83883ab2':
Stop using getDSTSavings.
2012-09-06 16:45:38 -07:00
Elliott Hughes
001d145610
am 0c0d6052: am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
...
* commit '0c0d605231e78c3a883b88b4abbc46ee29a7a194':
Stop hard-coding sample 12- and 24-hour times.
2012-09-06 16:43:46 -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
2ec3622a99
am 2c705626: (-s ours) am d4e216bc: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
...
* commit '2c705626e5cfa29adddb0f82fca261560d4fd9a8':
Revert "Import translations. DO NOT MERGE"
2012-09-06 11:19:02 -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
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
