OSDN Git Service
Matthew Xie [Tue, 11 Sep 2012 00:15:12 +0000 (17:15 -0700)]
am
5b0e875d: am
de101033: Merge "Fixed the display count of connected panu device." into jb-mr1-dev
* commit '
5b0e875d2d50d5a805028f495262fcbab9773c11':
Fixed the display count of connected panu device.
rich cannings [Tue, 11 Sep 2012 00:11:56 +0000 (17:11 -0700)]
am
32cf21c9: am
bfbdceff: Grey out App Check setting when no verifiers exist
* commit '
32cf21c9b9000238d69870cada23d45233d11670':
Grey out App Check setting when no verifiers exist
rich cannings [Tue, 11 Sep 2012 00:10:34 +0000 (17:10 -0700)]
am
e6195a12: am
1352c142: Merge "Add package verification to settings app" into jb-mr1-dev
* commit '
e6195a12edac8e32c9176771b36b64915498706d':
Add package verification to settings app
Jeff Brown [Tue, 11 Sep 2012 00:10:15 +0000 (17:10 -0700)]
am
b35bdfe9: am
eda43176: Enable auto-brightness adjustment feature with system prop.
* commit '
b35bdfe9540b2e296fad57820d2b9ad7504532f9':
Enable auto-brightness adjustment feature with system prop.
Svetoslav Ganov [Tue, 11 Sep 2012 00:08:44 +0000 (17:08 -0700)]
am
54ae7e51: am
d4b711e6: Merge "Settings for the screen magnification feature." into jb-mr1-dev
* commit '
54ae7e51a8a675e4ab4d671e19099f74502aba81':
Settings for the screen magnification feature.
Christopher Tate [Tue, 11 Sep 2012 00:06:45 +0000 (17:06 -0700)]
am
7b251126: am
6c084141: Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev
* commit '
7b2511260f3782d656e8712cf69edd9bf88a150b':
Update Settings app to manipulate now-global settings properly
Jeff Sharkey [Tue, 11 Sep 2012 00:06:09 +0000 (17:06 -0700)]
am
20ec00d3: am
04df8b77: Iteration on multi-user storage UI.
* commit '
20ec00d3e8681f57cdfe465a907c3fc705b05772':
Iteration on multi-user storage UI.
Baligh Uddin [Mon, 10 Sep 2012 21:29:41 +0000 (14:29 -0700)]
Revert "Import translations. DO NOT MERGE"
Broken Build.
This reverts commit
e88b7faf434ef1ddecf341e6c3470bc055610bb7
Change-Id: I6860b5d4694e8f6338c190f14c6e615a45030076
Baligh Uddin [Mon, 10 Sep 2012 19:19:07 +0000 (12:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibeb05d837712dbbc9c7728faa7f745ad4f37dcc3
Auto-generated-cl: translation import
Matthew Xie [Mon, 10 Sep 2012 19:06:51 +0000 (12:06 -0700)]
am
de101033: Merge "Fixed the display count of connected panu device." into jb-mr1-dev
* commit '
de101033025c53ab8f16c31c57c003c757e47cec':
Fixed the display count of connected panu device.
Matthew Xie [Mon, 10 Sep 2012 19:05:19 +0000 (12:05 -0700)]
Merge "Fixed the display count of connected panu device." into jb-mr1-dev
zzy [Sat, 8 Sep 2012 00:33:59 +0000 (17:33 -0700)]
Fixed the display count of connected panu device.
Root cause: Bluez relies on the count of activated pan network
interfaces to show how many panu devices are connected. But
Bluedroid has only one shared pan network interface for any
number of connected panu devices.
Change-Id: I52e3d6d79e2f1b9f8afab1d70c9ff1eca3ef2349
rich cannings [Sun, 9 Sep 2012 21:39:32 +0000 (14:39 -0700)]
am
bfbdceff: Grey out App Check setting when no verifiers exist
* commit '
bfbdceffe60e20a8db91b54cc81cfe49ea0dd96a':
Grey out App Check setting when no verifiers exist
rich cannings [Sun, 9 Sep 2012 19:48:50 +0000 (12:48 -0700)]
Grey out App Check setting when no verifiers exist
Bug:
7082362
Change-Id: I6e8a6032b58145fe6e2918f364ffd92cbb97ed67
rich cannings [Sun, 9 Sep 2012 05:18:51 +0000 (22:18 -0700)]
am
1352c142: Merge "Add package verification to settings app" into jb-mr1-dev
* commit '
1352c142a33d0c3ad8ed0f58bbc1d6ce7158cb55':
Add package verification to settings app
rich cannings [Sun, 9 Sep 2012 05:17:10 +0000 (22:17 -0700)]
Merge "Add package verification to settings app" into jb-mr1-dev
Jeff Brown [Sat, 8 Sep 2012 22:56:27 +0000 (15:56 -0700)]
am
eda43176: Enable auto-brightness adjustment feature with system prop.
* commit '
eda43176e3f1fd7dcdd481e4e759c62450f96c88':
Enable auto-brightness adjustment feature with system prop.
Jeff Brown [Sat, 8 Sep 2012 22:12:19 +0000 (15:12 -0700)]
Enable auto-brightness adjustment feature with system prop.
This feature is experimental and disabled by default.
Change-Id: I9c3c77d6d207ceec65e0babc7915db8d439d5da2
rich cannings [Fri, 7 Sep 2012 20:20:44 +0000 (13:20 -0700)]
Add package verification to settings app
Adds a dialog/toggle in security settings to turn package verification on and
off.
Bug:
7082362
Change-Id: I9985437ae28e4a999992c91a7e88547495ccbda2
Svetoslav Ganov [Fri, 7 Sep 2012 23:22:47 +0000 (16:22 -0700)]
am
d4b711e6: Merge "Settings for the screen magnification feature." into jb-mr1-dev
* commit '
d4b711e60361a2a05ffa11a4199cceea54d3ea96':
Settings for the screen magnification feature.
Svetoslav Ganov [Fri, 7 Sep 2012 23:20:36 +0000 (16:20 -0700)]
Merge "Settings for the screen magnification feature." into jb-mr1-dev
Svetoslav Ganov [Mon, 6 Aug 2012 17:55:11 +0000 (10:55 -0700)]
Settings for the screen magnification feature.
1. Screen magnification on the device has to he explicitly enabled
by the user before allowing a global gesture related interactions.
The feature toggle setting is in Settings->Accessibility and it
is a separate screen with instructions how to use the feature
and a toggle switch.
2. Added a setting in developer options for toggling the magnification
auto update feature. If this features is on the screen is zoomed
out or rotation or activity start. Also if the feature is enabled
the magnified viewport will scroll to show popped up windows.
bug:
5587727
Change-Id: Ic45a21d3a3928e2f5aac034751801f090b261488
Christopher Tate [Fri, 7 Sep 2012 21:38:56 +0000 (14:38 -0700)]
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
Christopher Tate [Fri, 7 Sep 2012 21:37:03 +0000 (14:37 -0700)]
Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev
Christopher Tate [Fri, 7 Sep 2012 20:35:31 +0000 (13:35 -0700)]
Update Settings app to manipulate now-global settings properly
Change-Id: I6c269051c7d2db87f70f44df74e06456588c3b6f
Jeff Sharkey [Fri, 7 Sep 2012 20:26:56 +0000 (13:26 -0700)]
am
04df8b77: Iteration on multi-user storage UI.
* commit '
04df8b77a40c06488a954a22cc5be638179b7747':
Iteration on multi-user storage UI.
Jeff Sharkey [Fri, 7 Sep 2012 20:23:47 +0000 (13:23 -0700)]
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
Jeff Sharkey [Fri, 7 Sep 2012 06:26:15 +0000 (23:26 -0700)]
am
e8d2ae5f: am
96c2f8c5: Progress towards split storage categories.
* commit '
e8d2ae5f175bdca0eedf44c0207740678102bb46':
Progress towards split storage categories.
Jeff Sharkey [Fri, 7 Sep 2012 06:24:53 +0000 (23:24 -0700)]
am
96c2f8c5: Progress towards split storage categories.
* commit '
96c2f8c50865e823e710be4d92f1589f978f03c2':
Progress towards split storage categories.
Jeff Sharkey [Fri, 7 Sep 2012 05:46:21 +0000 (22:46 -0700)]
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
Elliott Hughes [Thu, 6 Sep 2012 23:45:38 +0000 (16:45 -0700)]
am
07e5c690: am
88220b72: am
4ad02d02: am
a76ba7bb: am
cfbc61de: Merge "Stop using getDSTSavings."
* commit '
07e5c69010853c6c94cd27ac2c92516b83883ab2':
Stop using getDSTSavings.
Elliott Hughes [Thu, 6 Sep 2012 23:43:46 +0000 (16:43 -0700)]
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.
Elliott Hughes [Thu, 6 Sep 2012 23:43:26 +0000 (16:43 -0700)]
am
88220b72: am
4ad02d02: am
a76ba7bb: am
cfbc61de: Merge "Stop using getDSTSavings."
* commit '
88220b72044392f0cbfecb24c84e6a63e82be25c':
Stop using getDSTSavings.
Elliott Hughes [Thu, 6 Sep 2012 23:41:35 +0000 (16:41 -0700)]
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.
Elliott Hughes [Thu, 6 Sep 2012 23:41:16 +0000 (16:41 -0700)]
am
4ad02d02: am
a76ba7bb: am
cfbc61de: Merge "Stop using getDSTSavings."
* commit '
4ad02d02b8a27c627eace2bdf1fe8e0b3cfe08fb':
Stop using getDSTSavings.
Elliott Hughes [Thu, 6 Sep 2012 23:40:09 +0000 (16:40 -0700)]
am
a76ba7bb: am
cfbc61de: Merge "Stop using getDSTSavings."
* commit '
a76ba7bb301e2349541ddeeb492d3bf4f6e6b70c':
Stop using getDSTSavings.
Elliott Hughes [Thu, 6 Sep 2012 23:39:41 +0000 (16:39 -0700)]
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.
Elliott Hughes [Thu, 6 Sep 2012 23:38:37 +0000 (16:38 -0700)]
am
cfbc61de: Merge "Stop using getDSTSavings."
* commit '
cfbc61de3f94a620153ca83a790e4d1b03a9078e':
Stop using getDSTSavings.
Elliott Hughes [Thu, 6 Sep 2012 23:37:44 +0000 (16:37 -0700)]
am
680c8c8e: resolved conflicts for merge of
33f86196 to stage-aosp-master
* commit '
680c8c8e43804d9bf69568d4748b3bd3a4aea0ee':
Stop hard-coding sample 12- and 24-hour times.
Elliott Hughes [Thu, 6 Sep 2012 23:09:04 +0000 (16:09 -0700)]
resolved conflicts for merge of
33f86196 to stage-aosp-master
Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
Elliott Hughes [Thu, 6 Sep 2012 22:50:10 +0000 (15:50 -0700)]
Merge "Stop using getDSTSavings."
Elliott Hughes [Thu, 6 Sep 2012 22:30:51 +0000 (15:30 -0700)]
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
Elliott Hughes [Thu, 6 Sep 2012 22:29:46 +0000 (15:29 -0700)]
Merge "Stop hard-coding sample 12- and 24-hour times."
Elliott Hughes [Thu, 6 Sep 2012 21:49:35 +0000 (14:49 -0700)]
Stop hard-coding sample 12- and 24-hour times.
Bug:
6881640
Change-Id: I6b0d6404b0299f9efa8fd12779799f703f1c764f
Baligh Uddin [Thu, 6 Sep 2012 18:19:02 +0000 (11:19 -0700)]
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"
Baligh Uddin [Thu, 6 Sep 2012 18:17:39 +0000 (11:17 -0700)]
am
d4e216bc: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
d4e216bc9eb9b8aecd031a5f3c2a412857333a99':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 6 Sep 2012 18:16:31 +0000 (11:16 -0700)]
Merge "Revert "Import translations. DO NOT MERGE""
Baligh Uddin [Thu, 6 Sep 2012 18:16:17 +0000 (11:16 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
Baligh Uddin [Thu, 6 Sep 2012 18:16:03 +0000 (11:16 -0700)]
Revert "Import translations. DO NOT MERGE"
Broke the build.
This reverts commit
d08dce4e693d898f12dacac23e84cf17ec3d6ec6
Change-Id: I512a72571adfa5c8cd893a72c7dc40570decec47
Baligh Uddin [Thu, 6 Sep 2012 18:15:52 +0000 (11:15 -0700)]
Revert "Import translations. DO NOT MERGE"
Broke the build.
This reverts commit
9dcb0727d0d7be183d615d7bdfb6836d2017966a
Change-Id: I3a468f51981456476ca9c76086f0a5c08ba6a61b
Baligh Uddin [Thu, 6 Sep 2012 17:57:48 +0000 (10:57 -0700)]
am
237882f1: (-s ours) am
d2dec8c7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
237882f1480aebe242dad3bae09a362a22a2e5a4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 6 Sep 2012 17:55:40 +0000 (10:55 -0700)]
am
d2dec8c7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
d2dec8c70eb8f745425c09070069ef52d306b233':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 6 Sep 2012 17:53:13 +0000 (10:53 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 6 Sep 2012 17:51:57 +0000 (10:51 -0700)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Thu, 6 Sep 2012 16:16:31 +0000 (09:16 -0700)]
am
daed50bd: (-s ours) am
710aeba1: am
c53ce268: (-s ours) Reconcile with jb-release - do not merge
* commit '
daed50bd1bd8351b852f4cd40bfe444074a5846e':
The Android Open Source Project [Thu, 6 Sep 2012 16:11:22 +0000 (09:11 -0700)]
am
710aeba1: am
c53ce268: (-s ours) Reconcile with jb-release - do not merge
* commit '
710aeba1ce0bf2d121aaaf659284074750b43c6e':
The Android Open Source Project [Thu, 6 Sep 2012 15:21:38 +0000 (08:21 -0700)]
am
c53ce268: (-s ours) Reconcile with jb-release - do not merge
* commit '
c53ce26836eccfe9c0bb315d965bc73a9bd7b214':
The Android Open Source Project [Thu, 6 Sep 2012 15:20:51 +0000 (08:20 -0700)]
am
f3541a5f: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
f3541a5f0510c1d3f214358c0b7e06470c6d4b3b':
The Android Open Source Project [Thu, 6 Sep 2012 15:09:26 +0000 (08:09 -0700)]
Reconcile with jb-release - do not merge
Change-Id: I34fdfc427ea0fd0dc887303e7c019226a665f4de
The Android Open Source Project [Thu, 6 Sep 2012 14:54:52 +0000 (07:54 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I9619964e59d6d3f9036372e67278498472f1d290
The Android Automerger [Thu, 6 Sep 2012 13:34:42 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Charles Chen [Thu, 6 Sep 2012 00:17:43 +0000 (17:17 -0700)]
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.
Charles Chen [Thu, 6 Sep 2012 00:14:55 +0000 (17:14 -0700)]
am
ee04e472: Merge "Add content descriptions to power control widget." into jb-mr1-dev
* commit '
ee04e47216ca947dfc781d1b4116f252dd2aa5a4':
Add content descriptions to power control widget.
Charles Chen [Thu, 6 Sep 2012 00:13:24 +0000 (17:13 -0700)]
Merge "Add content descriptions to power control widget." into jb-mr1-dev
Baligh Uddin [Wed, 5 Sep 2012 21:05:16 +0000 (14:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaad0437ec086a52ec61bea09e31f60884d72c211
Auto-generated-cl: translation import
Baligh Uddin [Wed, 5 Sep 2012 21:02:53 +0000 (14:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: If5b1608924c422e97c0a12ff0a41f0ade35b2822
Auto-generated-cl: translation import
John Spurlock [Wed, 5 Sep 2012 15:01:01 +0000 (08:01 -0700)]
am
fb2a89c6: am
1537e8b3: Dream settings: list items back to constant height
* commit '
fb2a89c686ffe8b37cd90359987505e5425e2ffe':
Dream settings: list items back to constant height
John Spurlock [Wed, 5 Sep 2012 14:59:19 +0000 (07:59 -0700)]
am
1537e8b3: Dream settings: list items back to constant height
* commit '
1537e8b3e8d81bf404f6aa70c8ca514f3ff62dd5':
Dream settings: list items back to constant height
John Spurlock [Tue, 4 Sep 2012 11:55:46 +0000 (07:55 -0400)]
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
The Android Automerger [Wed, 5 Sep 2012 13:34:36 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Matthew Xie [Tue, 4 Sep 2012 22:34:23 +0000 (15:34 -0700)]
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
Matthew Xie [Tue, 4 Sep 2012 22:32:28 +0000 (15:32 -0700)]
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
Matthew Xie [Tue, 4 Sep 2012 22:31:03 +0000 (15:31 -0700)]
Merge "Clear profile connnection status of bonded devices when BT is turned off" into jb-mr1-dev
Ganesh Ganapathi Batta [Wed, 29 Aug 2012 21:32:26 +0000 (14:32 -0700)]
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
The Android Automerger [Tue, 4 Sep 2012 13:33:28 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Przemyslaw Szczepaniak [Mon, 3 Sep 2012 15:12:07 +0000 (08:12 -0700)]
am
6b329db9: am
22dc1fe2: Make TTS languages list sorted.
* commit '
6b329db9ebc04f94f5b1a3cd7f612c1cc699fae4':
Make TTS languages list sorted.
Przemyslaw Szczepaniak [Mon, 3 Sep 2012 15:10:32 +0000 (08:10 -0700)]
am
22dc1fe2: Make TTS languages list sorted.
* commit '
22dc1fe2bae886b385ddc22ee4f2819e5764c71a':
Make TTS languages list sorted.
Przemyslaw Szczepaniak [Mon, 3 Sep 2012 13:53:10 +0000 (14:53 +0100)]
Make TTS languages list sorted.
Also makes sure that languages list always have underlying array after onCreate.
Bug:
5640782
Change-Id: Id85d0099efccc9a64458d24853b5c98a35307b38
The Android Automerger [Mon, 3 Sep 2012 13:34:43 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Fri, 31 Aug 2012 17:28:15 +0000 (10:28 -0700)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 31 Aug 2012 16:33:10 +0000 (09:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iba535ca4a6090d6c3b9e4a270323f4af52ae611b
Auto-generated-cl: translation import
Jean-Baptiste Queru [Fri, 31 Aug 2012 14:40:33 +0000 (07:40 -0700)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
38136be4a356784e0bad9dcfa5d2115fc2221704.
Mathias Agopian [Fri, 31 Aug 2012 09:29:26 +0000 (02:29 -0700)]
am
66514b78: (-s ours) am
c888555f: FIX BUILD (DO NOT MERGE)
* commit '
66514b7899eb2744d51b0f1463f4e2aa98da7eed':
FIX BUILD (DO NOT MERGE)
Mathias Agopian [Fri, 31 Aug 2012 09:27:07 +0000 (02:27 -0700)]
am
c888555f: FIX BUILD (DO NOT MERGE)
* commit '
c888555f8907328a8625cb2301e081fcd143f2c5':
FIX BUILD (DO NOT MERGE)
Mathias Agopian [Fri, 31 Aug 2012 08:59:05 +0000 (01:59 -0700)]
FIX BUILD (DO NOT MERGE)
Revert "Import translations. DO NOT MERGE"
This reverts commit
b3e78cc41f16b0227a5fd31431c95f911c268567.
Change-Id: Ifbff2b21c249dab09126b03a8cbbccde964781df
Baligh Uddin [Fri, 31 Aug 2012 05:15:27 +0000 (22:15 -0700)]
am
968a7be2: (-s ours) am
f9e25e83: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
968a7be25e0f6d13d92d38694ea5df8209aa1e05':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 31 Aug 2012 05:12:24 +0000 (22:12 -0700)]
am
f9e25e83: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
f9e25e833f3bed04ebdb6481176584dfe3691088':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 31 Aug 2012 05:10:15 +0000 (22:10 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 31 Aug 2012 05:09:45 +0000 (22:09 -0700)]
Merge "Import translations. DO NOT MERGE"
Amith Yamasani [Fri, 31 Aug 2012 00:31:40 +0000 (17:31 -0700)]
am
1a3b2c00: am
788cde4c: Rename settings title for user management screen
* commit '
1a3b2c00eb43f9d737b85eed04a4ea6547b7ba4a':
Rename settings title for user management screen
Amith Yamasani [Fri, 31 Aug 2012 00:28:53 +0000 (17:28 -0700)]
am
788cde4c: Rename settings title for user management screen
* commit '
788cde4ce41ec633056c9c2b1360826ad72cda40':
Rename settings title for user management screen
Amith Yamasani [Fri, 31 Aug 2012 00:25:20 +0000 (17:25 -0700)]
Rename settings title for user management screen
Change-Id: I0a57d52eb0c4e4fb8a8ab1449b98751927da2519
alanv [Fri, 31 Aug 2012 00:08:01 +0000 (17:08 -0700)]
Add content descriptions to power control widget.
Bug:
6361285
Change-Id: I4fd7ed519de9a5b7e50e6905550695fad02bcc42
Jeff Sharkey [Thu, 30 Aug 2012 22:30:22 +0000 (15:30 -0700)]
am
821ee347: am
037df2cb: Merge "Surface storage usage of other users." into jb-mr1-dev
* commit '
821ee3476aeb8cba856d78df2a776d0876be42f0':
Surface storage usage of other users.
Jeff Sharkey [Thu, 30 Aug 2012 22:28:39 +0000 (15:28 -0700)]
am
037df2cb: Merge "Surface storage usage of other users." into jb-mr1-dev
* commit '
037df2cb182edb3070080625031073d30abfc56a':
Surface storage usage of other users.
Jeff Sharkey [Thu, 30 Aug 2012 22:26:50 +0000 (15:26 -0700)]
Merge "Surface storage usage of other users." into jb-mr1-dev
Jeff Sharkey [Thu, 30 Aug 2012 22:20:10 +0000 (15:20 -0700)]
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
John Spurlock [Thu, 30 Aug 2012 21:01:34 +0000 (14:01 -0700)]
am
40db7c50: am
7af2aa52: More traditional list item style for dreams settings.
* commit '
40db7c50fd25d8ad051a4a87886cddc02e6d8336':
More traditional list item style for dreams settings.
John Spurlock [Thu, 30 Aug 2012 20:59:04 +0000 (13:59 -0700)]
am
7af2aa52: More traditional list item style for dreams settings.
* commit '
7af2aa52ac2e458969abeaefec217f6a4f976767':
More traditional list item style for dreams settings.
John Spurlock [Thu, 30 Aug 2012 18:58:16 +0000 (14:58 -0400)]
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