Commit Graph

8072 Commits

Author SHA1 Message Date
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
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
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
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
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
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
c462db6355 am c07c70be: (-s ours) am c6015d2f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'c07c70bea2b932f4a8d22195a50a3256296718ad':
  Import translations. DO NOT MERGE
2012-08-28 15:19:24 -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
Nick Kralevich
994670d9ba am 61720061: am 7e7912de: ChooseLockPassword: allow spaces in passwords
* commit '6172006184829f2da6e49de5609775e1caa41648':
  ChooseLockPassword: allow spaces in passwords
2012-08-28 15:15:15 -07:00
Baligh Uddin
c6015d2f59 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-28 15:15:09 -07:00
Baligh Uddin
dc45d89f7d Merge "Import translations. DO NOT MERGE" 2012-08-28 15:14:00 -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
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
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
d47fa79516 am e07b883a: am ca786f39: am c5fc6231: am 2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"
* commit 'e07b883a1a598f0cd9ccdd96c3eb6281c28c7ea0':
  Fix memory leak in ApnSettings-activity
2012-08-28 13:02:36 -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
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
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
The Android Automerger
4eccbcab6a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-28 06:34:26 -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
ece9b66e66 am 8e891823: (-s ours) am 786aacb7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '8e89182392e867b35729d01c4e3e45f5dff6d7f9':
  Import translations. DO NOT MERGE
2012-08-27 16:08:59 -07:00
Baligh Uddin
8e89182392 am 786aacb7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '786aacb79657a69f16840bff8b5862c6415d08bd':
  Import translations. DO NOT MERGE
2012-08-27 16:06:17 -07: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
Jeff Sharkey
d1dbff3621 am da40470d: Merge "Always-on VPN." into jb-mr1-dev
* commit 'da40470daae8c71fe3144970e7bb5b0d32ec6b9d':
  Always-on VPN.
2012-08-27 15:13:47 -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
da40470daa Merge "Always-on VPN." into jb-mr1-dev 2012-08-27 13:58:02 -07:00
The Android Automerger
c37c13a7bf merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-27 06:34:49 -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