summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-3149-322/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iba535ca4a6090d6c3b9e4a270323f4af52ae611b Auto-generated-cl: translation import
* | | | | | | Revert "Import translations. DO NOT MERGE"Jean-Baptiste Queru2012-08-3198-1622/+714
|/ / / / / / | | | | | | | | | | | | | | | | | | This reverts commit 38136be4a356784e0bad9dcfa5d2115fc2221704.
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-08-3098-714/+1622
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2998-714/+1622
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b4485deee442c978e1ee4e5f93e68a906bdab2f Auto-generated-cl: translation import
* | | | | | | am 1a3b2c00: am 788cde4c: Rename settings title for user management screenAmith Yamasani2012-08-301-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit '1a3b2c00eb43f9d737b85eed04a4ea6547b7ba4a': Rename settings title for user management screen
| * | | | | | Rename settings title for user management screenAmith Yamasani2012-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a57d52eb0c4e4fb8a8ab1449b98751927da2519
* | | | | | | am 821ee347: am 037df2cb: Merge "Surface storage usage of other users." into ↵Jeff Sharkey2012-08-301-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '821ee3476aeb8cba856d78df2a776d0876be42f0': Surface storage usage of other users.
| * | | | | | Merge "Surface storage usage of other users." into jb-mr1-devJeff Sharkey2012-08-301-1/+3
| |\ \ \ \ \ \
| | * | | | | | Surface storage usage of other users.Jeff Sharkey2012-08-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am 40db7c50: am 7af2aa52: More traditional list item style for dreams settings.John Spurlock2012-08-309-33/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | | * commit '40db7c50fd25d8ad051a4a87886cddc02e6d8336': More traditional list item style for dreams settings.
| * | | | | | More traditional list item style for dreams settings.John Spurlock2012-08-309-33/+28
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 79bd0a75: am 2dff5b10: Merge "New dream settings - first cut" into jb-mr1-devJohn Spurlock2012-08-2910-58/+119
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '79bd0a75554f11ee85a690976da0f7644e025eda': New dream settings - first cut
| * | | | | Merge "New dream settings - first cut" into jb-mr1-devJohn Spurlock2012-08-2910-58/+119
| |\ \ \ \ \
| | * | | | | New dream settings - first cutJohn Spurlock2012-08-2910-58/+119
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am b519a126: am b2b54eec: Add new setting to control overlay displays.Jeff Brown2012-08-293-0/+28
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'b519a1268eb36e7e5f7967e5ef4bc471e647236a': Add new setting to control overlay displays.
| * | | | | Add new setting to control overlay displays.Jeff Brown2012-08-293-0/+28
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I9582bb149dca716699ef5977ef8f84bb3136e0c0
| * | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2849-30/+701
| |/ / / | | | | | | | | | | | | | | | | Change-Id: I884b6bb2bd0045049a7578235563896afe9414a7 Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-08-2849-30/+407
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2849-30/+407
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1e28e68da7bccb82034f893665924808425ce428 Auto-generated-cl: translation import
* | | | | am 9b4d7aee: am 72d3f85d: am 300457ba: am 38ce5194: Merge "Enable to delete ↵Jean-Baptiste Queru2012-08-281-0/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | a stored persistent group from p2p settings." * commit '9b4d7aee4f74193ff1d642094a2947fc90fea24d': Enable to delete a stored persistent group from p2p settings.
| * | | am 300457ba: am 38ce5194: Merge "Enable to delete a stored persistent group ↵Jean-Baptiste Queru2012-08-281-0/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | from p2p settings." * commit '300457bad289f547430da21e72747e8840840832': Enable to delete a stored persistent group from p2p settings.
| | * | am 38ce5194: Merge "Enable to delete a stored persistent group from p2p ↵Jean-Baptiste Queru2012-08-281-0/+6
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | settings." * commit '38ce5194e89b83697466abe2994016507109ec54': Enable to delete a stored persistent group from p2p settings.
| | | * Merge "Enable to delete a stored persistent group from p2p settings."Jean-Baptiste Queru2012-08-281-0/+6
| | | |\
| | | | * Enable to delete a stored persistent group from p2p settings.Yoshihiko Ikenaga2012-08-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-2749-69/+135
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2749-69/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I61710e208f305569f238c02cc7aa8a3da8a0154b Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-08-2749-69/+135
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2749-69/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id789c1dba9f7f331cf985d1470a68161e770ac84 Auto-generated-cl: translation import
* | | | | | | am d1dbff36: am da40470d: Merge "Always-on VPN." into jb-mr1-devJeff Sharkey2012-08-274-4/+74
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * commit 'd1dbff362193c428bab38f189a041058650a7904': Always-on VPN.
| * | | | | Always-on VPN.Jeff Sharkey2012-08-264-4/+74
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-2449-8/+102
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2449-8/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8087ddd4451aef7aa8b07a1ab4019aab89723d8d Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-08-2449-8/+102
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2449-8/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I283e428d001ac5b313bc01836db8f1519f29d33f Auto-generated-cl: translation import
* | | | | | | am 15b07df7: am 2e3c7509: Make settings a little aware of multi-user install.Dianne Hackborn2012-08-241-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * commit '15b07df79467aeabbe185a38397a90b2961a61b1': Make settings a little aware of multi-user install.
| * | | | | Make settings a little aware of multi-user install.Dianne Hackborn2012-08-241-0/+2
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Id04f137dbc80dfee7b6c436efc2225ceccb88faa
* | | | | am f741006e: am 534529d0: am 88f37936: am 1183f487: Merge "MTP/PTP: disable ↵Jean-Baptiste Queru2012-08-242-0/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | am 88f37936: am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation ↵Jean-Baptiste Queru2012-08-242-0/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | for SD card while MTP/PTP is active" * commit '88f379367f208a75dfe95a081b25c27a54b06a1a': MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
| | * | | am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card ↵Jean-Baptiste Queru2012-08-232-0/+5
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | while MTP/PTP is active" * commit '1183f487c8ea8660415fcd30914844e8dc2de2bb': MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
| | | * | MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is activeLi Gang2012-08-102-0/+5
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check the USB connection status and MTP/PTP setting, if USB connected and MTP/PTP enabled, disable the erasing and umount operation. Judge SD card Mounting status and keep summary string. Change-Id: Iff3e0f25b581bc462c88fff59eb93d765baaddd7 Author: Li Gang <gang.g.li@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: 47043
| | * | am c5acc132: Import translations. DO NOT MERGEBaligh Uddin2012-08-144-23/+23
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'c5acc132ca3de71c36cca1ebea2635396172ab4a': Import translations. DO NOT MERGE
| | | * | Import translations. DO NOT MERGEBaligh Uddin2012-08-144-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iba3c413c6b912f21e0529b16159abf4e4427b14b Auto-generated-cl: translation import
| * | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2332-76/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9f722cc1c8451683f176ec7de9c62931426072f2 Auto-generated-cl: translation import
| * | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-2249-153/+160
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2249-153/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8a85d98874da3ff59642198c05dccfe50974fdcd Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2332-76/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4469d469295c80f83cece04b90681ab4f35c5488 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-08-2249-153/+160
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2249-153/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iefc2d9fb4059b9ffb4a1e08d0269907ce7ca73cc Auto-generated-cl: translation import
* | | | | | | am 9a53625b: am b18d58bd: Merge "Simplify User management settings to bare ↵Amith Yamasani2012-08-221-37/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | minimum" into jb-mr1-dev * commit '9a53625bd039abc5b08fd26e9d35e25c5268bfd1': Simplify User management settings to bare minimum
| * | | | | Simplify User management settings to bare minimumAmith Yamasani2012-08-221-37/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | No need to restrictions or account association at this time. Change-Id: Ic4ae43d5bb9d4308e67499495d44c12de9e61777