OSDN Git Service
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
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
Baligh Uddin [Thu, 30 Aug 2012 03:19:54 +0000 (20:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6b4485deee442c978e1ee4e5f93e68a906bdab2f
Auto-generated-cl: translation import
Baligh Uddin [Thu, 30 Aug 2012 03:17:20 +0000 (20:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie33abb2dac44b49a64040688f9ffe7a1d7add9f3
Auto-generated-cl: translation import
John Spurlock [Wed, 29 Aug 2012 23:00:02 +0000 (16:00 -0700)]
am
79bd0a75: am
2dff5b10: Merge "New dream settings - first cut" into jb-mr1-dev
* commit '
79bd0a75554f11ee85a690976da0f7644e025eda':
New dream settings - first cut
John Spurlock [Wed, 29 Aug 2012 22:57:54 +0000 (15:57 -0700)]
am
2dff5b10: Merge "New dream settings - first cut" into jb-mr1-dev
* commit '
2dff5b109b9dd4b55cb64d89ff55c56318052b5c':
New dream settings - first cut
John Spurlock [Wed, 29 Aug 2012 22:55:25 +0000 (15:55 -0700)]
Merge "New dream settings - first cut" into jb-mr1-dev
Jeff Brown [Wed, 29 Aug 2012 22:49:52 +0000 (15:49 -0700)]
am
b519a126: am
b2b54eec: Add new setting to control overlay displays.
* commit '
b519a1268eb36e7e5f7967e5ef4bc471e647236a':
Add new setting to control overlay displays.
Jeff Brown [Wed, 29 Aug 2012 22:46:43 +0000 (15:46 -0700)]
am
b2b54eec: Add new setting to control overlay displays.
* commit '
b2b54eec86bc5b5830e4480407cbd1fccfd21256':
Add new setting to control overlay displays.
John Spurlock [Wed, 22 Aug 2012 13:21:58 +0000 (09:21 -0400)]
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
Jeff Brown [Wed, 29 Aug 2012 09:33:06 +0000 (02:33 -0700)]
Add new setting to control overlay displays.
Change-Id: I9582bb149dca716699ef5977ef8f84bb3136e0c0
Baligh Uddin [Tue, 28 Aug 2012 22:19:24 +0000 (15:19 -0700)]
am
c07c70be: (-s ours) am
c6015d2f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c07c70bea2b932f4a8d22195a50a3256296718ad':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 28 Aug 2012 22:16:40 +0000 (15:16 -0700)]
am
c6015d2f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c6015d2f593d0e5ef909d7157df4b15831236acb':
Import translations. DO NOT MERGE
Nick Kralevich [Tue, 28 Aug 2012 22:15:15 +0000 (15:15 -0700)]
am
61720061: am
7e7912de: ChooseLockPassword: allow spaces in passwords
* commit '
6172006184829f2da6e49de5609775e1caa41648':
ChooseLockPassword: allow spaces in passwords
Baligh Uddin [Tue, 28 Aug 2012 22:15:08 +0000 (15:15 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 28 Aug 2012 22:14:00 +0000 (15:14 -0700)]
Merge "Import translations. DO NOT MERGE"
Nick Kralevich [Tue, 28 Aug 2012 22:13:33 +0000 (15:13 -0700)]
am
7e7912de: ChooseLockPassword: allow spaces in passwords
* commit '
7e7912de4fb44481ded8e17d5ac1d7a1c9a0d184':
ChooseLockPassword: allow spaces in passwords
Baligh Uddin [Tue, 28 Aug 2012 21:32:29 +0000 (14:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1e28e68da7bccb82034f893665924808425ce428
Auto-generated-cl: translation import
Baligh Uddin [Tue, 28 Aug 2012 21:29:09 +0000 (14:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I884b6bb2bd0045049a7578235563896afe9414a7
Auto-generated-cl: translation import
Nick Kralevich [Tue, 28 Aug 2012 17:33:45 +0000 (10:33 -0700)]
ChooseLockPassword: allow spaces in passwords
This fixes http://code.google.com/p/android/issues/detail?id=35988
Change-Id: I1880d7e41028f034e75a048226cce3bf96845a09
Wink Saville [Tue, 28 Aug 2012 20:02:36 +0000 (13:02 -0700)]
am
e07b883a: am
ca786f39: am
c5fc6231: am
2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"
* commit '
e07b883a1a598f0cd9ccdd96c3eb6281c28c7ea0':
Fix memory leak in ApnSettings-activity
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:02:25 +0000 (13:02 -0700)]
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.
Wink Saville [Tue, 28 Aug 2012 19:21:04 +0000 (12:21 -0700)]
am
ca786f39: am
c5fc6231: am
2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"
* commit '
ca786f3989c93ac1c368151c1cede7b47fc10711':
Fix memory leak in ApnSettings-activity
Wink Saville [Tue, 28 Aug 2012 19:18:57 +0000 (12:18 -0700)]
am
c5fc6231: am
2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"
* commit '
c5fc6231312b21efb601367bae28d63f9b26ac52':
Fix memory leak in ApnSettings-activity
Wink Saville [Tue, 28 Aug 2012 19:13:59 +0000 (12:13 -0700)]
am
2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"
* commit '
2d6b52bd38046abe1761cf0cc1f0c415e4a24fef':
Fix memory leak in ApnSettings-activity
Wink Saville [Tue, 28 Aug 2012 19:01:28 +0000 (12:01 -0700)]
Merge "Fix memory leak in ApnSettings-activity"
Jean-Baptiste Queru [Tue, 28 Aug 2012 18:17:50 +0000 (11:17 -0700)]
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.
Jean-Baptiste Queru [Tue, 28 Aug 2012 18:15:22 +0000 (11:15 -0700)]
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.
Jean-Baptiste Queru [Tue, 28 Aug 2012 18:10:06 +0000 (11:10 -0700)]
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.
Jean-Baptiste Queru [Tue, 28 Aug 2012 17:46:59 +0000 (10:46 -0700)]
Merge "Enable to delete a stored persistent group from p2p settings."
Yoshihiko Ikenaga [Mon, 27 Aug 2012 13:10:05 +0000 (22:10 +0900)]
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>
Baligh Uddin [Mon, 27 Aug 2012 23:08:59 +0000 (16:08 -0700)]
am
8e891823: (-s ours) am
786aacb7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
8e89182392e867b35729d01c4e3e45f5dff6d7f9':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 27 Aug 2012 23:06:17 +0000 (16:06 -0700)]
am
786aacb7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
786aacb79657a69f16840bff8b5862c6415d08bd':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 27 Aug 2012 23:03:30 +0000 (16:03 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 27 Aug 2012 23:03:10 +0000 (16:03 -0700)]
Merge "Import translations. DO NOT MERGE"
Jeff Sharkey [Mon, 27 Aug 2012 22:17:24 +0000 (15:17 -0700)]
am
d1dbff36: am
da40470d: Merge "Always-on VPN." into jb-mr1-dev
* commit '
d1dbff362193c428bab38f189a041058650a7904':
Always-on VPN.
Jeff Sharkey [Mon, 27 Aug 2012 22:13:47 +0000 (15:13 -0700)]
am
da40470d: Merge "Always-on VPN." into jb-mr1-dev
* commit '
da40470daae8c71fe3144970e7bb5b0d32ec6b9d':
Always-on VPN.
Baligh Uddin [Mon, 27 Aug 2012 22:11:32 +0000 (15:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id789c1dba9f7f331cf985d1470a68161e770ac84
Auto-generated-cl: translation import
Baligh Uddin [Mon, 27 Aug 2012 22:08:09 +0000 (15:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I61710e208f305569f238c02cc7aa8a3da8a0154b
Auto-generated-cl: translation import
Jeff Sharkey [Mon, 27 Aug 2012 20:58:02 +0000 (13:58 -0700)]
Merge "Always-on VPN." into jb-mr1-dev
Jeff Sharkey [Sat, 25 Aug 2012 07:06:08 +0000 (00:06 -0700)]
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
Amith Yamasani [Sun, 26 Aug 2012 05:12:55 +0000 (22:12 -0700)]
am
af71f2ac: am
44120d19: Merge "Avoid re-creating a user when activity is resumed" into jb-mr1-dev
* commit '
af71f2ac9423918be8ac1191df9c223a2744bb38':
Avoid re-creating a user when activity is resumed
Amith Yamasani [Sun, 26 Aug 2012 05:11:20 +0000 (22:11 -0700)]
am
44120d19: Merge "Avoid re-creating a user when activity is resumed" into jb-mr1-dev
* commit '
44120d19f33f14b0a6f1b2c656335a476de406ee':
Avoid re-creating a user when activity is resumed
Amith Yamasani [Sun, 26 Aug 2012 05:09:53 +0000 (22:09 -0700)]
Merge "Avoid re-creating a user when activity is resumed" into jb-mr1-dev
Amith Yamasani [Sun, 26 Aug 2012 04:56:54 +0000 (21:56 -0700)]
am
07e3716b: am
b1491842: Merge "Settings: Fix crash seen when setting the radio band" into jb-mr1-dev
* commit '
07e3716b7e485982b9b024249d2f7a9b09e529df':
Settings: Fix crash seen when setting the radio band
Amith Yamasani [Sun, 26 Aug 2012 04:55:24 +0000 (21:55 -0700)]
am
b1491842: Merge "Settings: Fix crash seen when setting the radio band" into jb-mr1-dev
* commit '
b1491842c48fd0cda2539ee98a30fa82a744af15':
Settings: Fix crash seen when setting the radio band
Amith Yamasani [Sun, 26 Aug 2012 04:52:38 +0000 (21:52 -0700)]
Merge "Settings: Fix crash seen when setting the radio band" into jb-mr1-dev
Jeevaka Badrappan [Fri, 1 Jun 2012 07:57:31 +0000 (10:57 +0300)]
Settings: Fix crash seen when setting the radio band
When the user presses back before the set radio band
result dialog is shown, crash is seen as the activity
associated with this is already finishing.
Check the activity status before displaying the
set radio band result alert dialog.
Change-Id: I34104773f5cce0be6d0021823b2889aad0fdb945
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 39317
Amith Yamasani [Sat, 25 Aug 2012 20:01:51 +0000 (13:01 -0700)]
am
d3d801c9: am
5e61ba55: am
41446512: am
52d996ed: Merge "Settings: Fix crash seen when setting the radio band"
* commit '
d3d801c9a9a7876d7b73f930db3c8b1395775597':
Settings: Fix crash seen when setting the radio band
Amith Yamasani [Sat, 25 Aug 2012 20:00:19 +0000 (13:00 -0700)]
am
5e61ba55: am
41446512: am
52d996ed: Merge "Settings: Fix crash seen when setting the radio band"
* commit '
5e61ba5576d912c42af004510484a77625a96d44':
Settings: Fix crash seen when setting the radio band
Amith Yamasani [Sat, 25 Aug 2012 19:58:18 +0000 (12:58 -0700)]
am
41446512: am
52d996ed: Merge "Settings: Fix crash seen when setting the radio band"
* commit '
41446512cfa6e009187b7cc67fa34a29f82ddccc':
Settings: Fix crash seen when setting the radio band
Amith Yamasani [Sat, 25 Aug 2012 19:56:23 +0000 (12:56 -0700)]
am
52d996ed: Merge "Settings: Fix crash seen when setting the radio band"
* commit '
52d996edeb7958d386bbf6655e9acfec3b10fdf2':
Settings: Fix crash seen when setting the radio band
Amith Yamasani [Sat, 25 Aug 2012 18:55:41 +0000 (11:55 -0700)]
Merge "Settings: Fix crash seen when setting the radio band"
Amith Yamasani [Sat, 25 Aug 2012 14:47:43 +0000 (07:47 -0700)]
Avoid re-creating a user when activity is resumed
onCreate() was getting called again, resulting in another user being
created. Keeping the new userid across pause/resume.
Change-Id: Id7930227895e95a60a77efddf361ab9408a8f797
The Android Open Source Project [Sat, 25 Aug 2012 14:21:30 +0000 (07:21 -0700)]
am
aecda495: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
aecda4950b9ef92285bb1755183c2b10e6c2c2c5':
Show the license dialog only if the activity is still showing
The Android Open Source Project [Sat, 25 Aug 2012 14:17:23 +0000 (07:17 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: If68758d7bb648f89c4a663ca6bcc419f380518e8
Baligh Uddin [Fri, 24 Aug 2012 22:06:58 +0000 (15:06 -0700)]
am
8bd1a323: (-s ours) am
cf033092: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
8bd1a3234ac81bc3d26de72647ad611615273f62':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 24 Aug 2012 22:05:21 +0000 (15:05 -0700)]
am
cf033092: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
cf033092732809d1ea0734f1f761617a8c4ccd32':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 24 Aug 2012 22:03:15 +0000 (15:03 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 24 Aug 2012 22:02:55 +0000 (15:02 -0700)]
Merge "Import translations. DO NOT MERGE"
Dianne Hackborn [Fri, 24 Aug 2012 21:42:55 +0000 (14:42 -0700)]
am
15b07df7: am
2e3c7509: Make settings a little aware of multi-user install.
* commit '
15b07df79467aeabbe185a38397a90b2961a61b1':
Make settings a little aware of multi-user install.
Dianne Hackborn [Fri, 24 Aug 2012 21:40:15 +0000 (14:40 -0700)]
am
2e3c7509: Make settings a little aware of multi-user install.
* commit '
2e3c75094bde1cfca1b15f66f5ff3d0a85baf0a0':
Make settings a little aware of multi-user install.
Baligh Uddin [Fri, 24 Aug 2012 20:32:09 +0000 (13:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I283e428d001ac5b313bc01836db8f1519f29d33f
Auto-generated-cl: translation import
Baligh Uddin [Fri, 24 Aug 2012 20:29:14 +0000 (13:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8087ddd4451aef7aa8b07a1ab4019aab89723d8d
Auto-generated-cl: translation import
Dianne Hackborn [Fri, 24 Aug 2012 01:44:31 +0000 (18:44 -0700)]
Make settings a little aware of multi-user install.
Change-Id: Id04f137dbc80dfee7b6c436efc2225ceccb88faa
Jeff Sharkey [Fri, 24 Aug 2012 18:36:31 +0000 (11:36 -0700)]
am
841c492e: am
f3de41a2: Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev
* commit '
841c492eda689b438d2d8385009696d5119a8e02':
Migrate legacy VPN arguments to system_server.
Jeff Sharkey [Fri, 24 Aug 2012 18:34:17 +0000 (11:34 -0700)]
am
f3de41a2: Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev
* commit '
f3de41a24d779c9fae6517ceb13596290076b600':
Migrate legacy VPN arguments to system_server.
Jeff Sharkey [Fri, 24 Aug 2012 18:33:02 +0000 (11:33 -0700)]
Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev
Jeff Sharkey [Fri, 24 Aug 2012 18:17:49 +0000 (11:17 -0700)]
Migrate legacy VPN arguments to system_server.
Generate the racoon and mtpd daemon arguments in system_server,
instead of accepting them from Settings.
Bug:
5756357
Change-Id: Ied048ca465aab03b2ae1c004388f49b82848b3f7
Jean-Baptiste Queru [Fri, 24 Aug 2012 14:34:55 +0000 (07:34 -0700)]
am
f741006e: am
534529d0: am
88f37936: am
1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
* commit '
f741006e7e542cebaa75fb3c05ade59a1f1d0891':
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
Jean-Baptiste Queru [Fri, 24 Aug 2012 14:32:22 +0000 (07:32 -0700)]
am
534529d0: am
88f37936: am
1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
* commit '
534529d0cc08b5559aef2650d58aaf48c04727a0':
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
Jean-Baptiste Queru [Fri, 24 Aug 2012 14:29:43 +0000 (07:29 -0700)]
am
88f37936: am
1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
* commit '
88f379367f208a75dfe95a081b25c27a54b06a1a':
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
Baligh Uddin [Fri, 24 Aug 2012 02:00:03 +0000 (19:00 -0700)]
am
ebf1a4cc: (-s ours) am
a5c6d6b3: Import translations. DO NOT MERGE
* commit '
ebf1a4cc6ae72e0790dd409b3d25890d415c782a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 24 Aug 2012 01:58:28 +0000 (18:58 -0700)]
am
a5c6d6b3: Import translations. DO NOT MERGE
* commit '
a5c6d6b32f2a5fe562dd77389d26c03c4b6f2e51':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 24 Aug 2012 01:13:40 +0000 (18:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4469d469295c80f83cece04b90681ab4f35c5488
Auto-generated-cl: translation import
Baligh Uddin [Fri, 24 Aug 2012 01:11:17 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f722cc1c8451683f176ec7de9c62931426072f2
Auto-generated-cl: translation import
Amith Yamasani [Thu, 23 Aug 2012 18:25:18 +0000 (11:25 -0700)]
Show the license dialog only if the activity is still showing
Bug:
6888990
Change-Id: Ide267739c7fd296356f26293f02bd794906fbd0a
Amith Yamasani [Thu, 23 Aug 2012 18:54:15 +0000 (11:54 -0700)]
am
b7808c71: am
6413d965: Merge "Show the license dialog only if the activity is still showing" into jb-mr1-dev
* commit '
b7808c71873f80dd4fb8c040960e92dd82b4b908':
Show the license dialog only if the activity is still showing
Amith Yamasani [Thu, 23 Aug 2012 18:30:45 +0000 (11:30 -0700)]
am
6413d965: Merge "Show the license dialog only if the activity is still showing" into jb-mr1-dev
* commit '
6413d9658b0b7ac425621c488eb7c13b4fd295f4':
Show the license dialog only if the activity is still showing
Amith Yamasani [Thu, 23 Aug 2012 18:28:06 +0000 (11:28 -0700)]
Merge "Show the license dialog only if the activity is still showing" into jb-mr1-dev
Amith Yamasani [Thu, 23 Aug 2012 18:25:18 +0000 (11:25 -0700)]
Show the license dialog only if the activity is still showing
Bug:
6888990
Change-Id: Ide267739c7fd296356f26293f02bd794906fbd0a
John Spurlock [Thu, 23 Aug 2012 17:51:15 +0000 (10:51 -0700)]
am
156d6afa: am
05b5097d: Merge "Settings: Minimal refactor to support new dreams api." into jb-mr1-dev
* commit '
156d6afa77ee8a8bff2fc6398142b9204ba54b92':
Settings: Minimal refactor to support new dreams api.
John Spurlock [Thu, 23 Aug 2012 17:48:30 +0000 (10:48 -0700)]
am
05b5097d: Merge "Settings: Minimal refactor to support new dreams api." into jb-mr1-dev
* commit '
05b5097d1871fc445fec27734b2f667539a13da0':
Settings: Minimal refactor to support new dreams api.
John Spurlock [Thu, 23 Aug 2012 17:47:15 +0000 (10:47 -0700)]
Merge "Settings: Minimal refactor to support new dreams api." into jb-mr1-dev
Jean-Baptiste Queru [Thu, 23 Aug 2012 16:47:04 +0000 (09:47 -0700)]
am
1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
* commit '
1183f487c8ea8660415fcd30914844e8dc2de2bb':
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
Jean-Baptiste Queru [Thu, 23 Aug 2012 16:31:35 +0000 (09:31 -0700)]
Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
John Spurlock [Wed, 22 Aug 2012 13:59:44 +0000 (09:59 -0400)]
Settings: Minimal refactor to support new dreams api.
Fix breaking changes to the dreams api. Master toggle
and multiple dreams support in Settings will be done in
a subsequent change.
Bug:
7028665
Change-Id: Ia56dd00ec50323fbba06473b1747e5015a3f1898
The Android Automerger [Thu, 23 Aug 2012 13:34:15 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
OSDN Git Service
