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
Change-Id: I512a72571adfa5c8cd893a72c7dc40570decec47
2012-09-06 11:16:03 -07:00
Baligh Uddin
cbc213e54c
Revert "Import translations. DO NOT MERGE"
...
Broke the build.
This reverts commit 9dcb0727d0
Change-Id: I3a468f51981456476ca9c76086f0a5c08ba6a61b
2012-09-06 11:15:52 -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
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
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
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
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
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
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
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
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
1da741e128
am 40db7c50
: am 7af2aa52
: More traditional list item style for dreams settings.
...
* commit '40db7c50fd25d8ad051a4a87886cddc02e6d8336':
More traditional list item style for dreams settings.
2012-08-30 14:01:34 -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
Baligh Uddin
38136be4a3
Import translations. DO NOT MERGE
...
Change-Id: I6b4485deee442c978e1ee4e5f93e68a906bdab2f
Auto-generated-cl: translation import
2012-08-29 20:19:54 -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
76d858c71c
am 79bd0a75
: am 2dff5b10
: Merge "New dream settings - first cut" into jb-mr1-dev
...
* commit '79bd0a75554f11ee85a690976da0f7644e025eda':
New dream settings - first cut
2012-08-29 16:00:02 -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
ee37876bd2
am b519a126
: am b2b54eec
: Add new setting to control overlay displays.
...
* commit 'b519a1268eb36e7e5f7967e5ef4bc471e647236a':
Add new setting to control overlay displays.
2012-08-29 15:49:52 -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
Jeff Brown
b2b54eec86
Add new setting to control overlay displays.
...
Change-Id: I9582bb149dca716699ef5977ef8f84bb3136e0c0
2012-08-29 06:15:23 -07:00
Baligh Uddin
dc45d89f7d
Merge "Import translations. DO NOT MERGE"
2012-08-28 15:14:00 -07:00
Baligh Uddin
935d99df05
Import translations. DO NOT MERGE
...
Change-Id: I1e28e68da7bccb82034f893665924808425ce428
Auto-generated-cl: translation import
2012-08-28 14:32:29 -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
Jean-Baptiste Queru
747337322c
am 9b4d7aee
: am 72d3f85d
: am 300457ba
: am 38ce5194
: Merge "Enable to delete a stored persistent group from p2p settings."
...
* commit '9b4d7aee4f74193ff1d642094a2947fc90fea24d':
Enable to delete a stored persistent group from p2p settings.
2012-08-28 13:02:25 -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
Jean-Baptiste Queru
300457bad2
am 38ce5194
: Merge "Enable to delete a stored persistent group from p2p settings."
...
* commit '38ce5194e89b83697466abe2994016507109ec54':
Enable to delete a stored persistent group from p2p settings.
2012-08-28 11:10:06 -07:00
Jean-Baptiste Queru
38ce5194e8
Merge "Enable to delete a stored persistent group from p2p settings."
2012-08-28 10:46:59 -07:00
Yoshihiko Ikenaga
f3f14665a3
Enable to delete a stored persistent group from p2p settings.
...
Enable to delete a stored persistent group from p2p settings.
The multilingualization has NOT been done yet.
Change-Id: I84bd89343c9e3ce5e62b8b96dfce9d286675b145
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com >
2012-08-28 15:16:38 +09:00
Baligh Uddin
786aacb796
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-27 16:03:31 -07:00
Baligh Uddin
0d33b292d0
Merge "Import translations. DO NOT MERGE"
2012-08-27 16:03:10 -07:00
Jeff Sharkey
4e51f92120
am d1dbff36
: am da40470d
: Merge "Always-on VPN." into jb-mr1-dev
...
* commit 'd1dbff362193c428bab38f189a041058650a7904':
Always-on VPN.
2012-08-27 15:17:24 -07:00
Baligh Uddin
43a48736c8
Import translations. DO NOT MERGE
...
Change-Id: Id789c1dba9f7f331cf985d1470a68161e770ac84
Auto-generated-cl: translation import
2012-08-27 15:11:32 -07:00
Baligh Uddin
c7bb3a1669
Import translations. DO NOT MERGE
...
Change-Id: I61710e208f305569f238c02cc7aa8a3da8a0154b
Auto-generated-cl: translation import
2012-08-27 15:08:09 -07:00
Jeff Sharkey
9fd7ac1ec7
Always-on VPN.
...
Adds support for always-on VPN profiles. Users pick an always-on VPN
from list of existing VPN profiles, which must use an IP address for
both VPN server and DNS. Moved "add" operation into action bar.
Bug: 5756357
Change-Id: I4c7ed7f2a3b027be1baf65c08213336a61f3acfe
2012-08-26 17:01:46 -07:00
Baligh Uddin
cf03309273
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-24 15:03:15 -07:00
Baligh Uddin
56d7fa5ed5
Merge "Import translations. DO NOT MERGE"
2012-08-24 15:02:56 -07:00
Dianne Hackborn
47401d924f
am 15b07df7
: am 2e3c7509
: Make settings a little aware of multi-user install.
...
* commit '15b07df79467aeabbe185a38397a90b2961a61b1':
Make settings a little aware of multi-user install.
2012-08-24 14:42:55 -07:00
Baligh Uddin
eb6f32285c
Import translations. DO NOT MERGE
...
Change-Id: I283e428d001ac5b313bc01836db8f1519f29d33f
Auto-generated-cl: translation import
2012-08-24 13:32:09 -07:00