summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Import translations. DO NOT MERGE"Baligh Uddin2012-09-0698-1286/+1332
| | | | | | | | Broke the build. This reverts commit 9dcb0727d0d7be183d615d7bdfb6836d2017966a Change-Id: I3a468f51981456476ca9c76086f0a5c08ba6a61b
* Import translations. DO NOT MERGEBaligh Uddin2012-09-0598-1332/+1286
| | | | | Change-Id: If5b1608924c422e97c0a12ff0a41f0ade35b2822 Auto-generated-cl: translation import
* Dream settings: list items back to constant heightJohn Spurlock2012-09-054-79/+92
| | | | | | | | | | | 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
* Merge "Clear profile connnection status of bonded devices when BT is turned ↵Matthew Xie2012-09-042-0/+20
|\ | | | | | | off" into jb-mr1-dev
| * Clear profile connnection status of bonded devices when BT is turned offGanesh Ganapathi Batta2012-09-042-0/+20
| | | | | | | | | | | | | | | | | | | | | | 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
* | Make TTS languages list sorted.Przemyslaw Szczepaniak2012-09-031-9/+32
|/ | | | | | | Also makes sure that languages list always have underlying array after onCreate. Bug: 5640782 Change-Id: Id85d0099efccc9a64458d24853b5c98a35307b38
* FIX BUILD (DO NOT MERGE)Mathias Agopian2012-08-3198-1330/+716
| | | | | | | | Revert "Import translations. DO NOT MERGE" This reverts commit b3e78cc41f16b0227a5fd31431c95f911c268567. Change-Id: Ifbff2b21c249dab09126b03a8cbbccde964781df
* Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-3098-716/+1330
|\
| * Import translations. DO NOT MERGEBaligh Uddin2012-08-2998-716/+1330
| | | | | | | | | | Change-Id: Ie33abb2dac44b49a64040688f9ffe7a1d7add9f3 Auto-generated-cl: translation import
* | Rename settings title for user management screenAmith Yamasani2012-08-301-1/+1
| | | | | | | | Change-Id: I0a57d52eb0c4e4fb8a8ab1449b98751927da2519
* | Merge "Surface storage usage of other users." into jb-mr1-devJeff Sharkey2012-08-306-178/+307
|\ \
| * | Surface storage usage of other users.Jeff Sharkey2012-08-306-178/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | More traditional list item style for dreams settings.John Spurlock2012-08-3011-90/+144
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "New dream settings - first cut" into jb-mr1-devJohn Spurlock2012-08-2915-448/+578
|\ \
| * | New dream settings - first cutJohn Spurlock2012-08-2915-448/+578
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Add new setting to control overlay displays.Jeff Brown2012-08-294-0/+63
|/ / | | | | | | Change-Id: I9582bb149dca716699ef5977ef8f84bb3136e0c0
* | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-2849-30/+701
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2012-08-2849-30/+701
| | | | | | | | | | | | | | | Change-Id: I884b6bb2bd0045049a7578235563896afe9414a7 Auto-generated-cl: translation import
* | | ChooseLockPassword: allow spaces in passwordsNick Kralevich2012-08-281-2/+2
| |/ |/| | | | | | | | | This fixes http://code.google.com/p/android/issues/detail?id=35988 Change-Id: I1880d7e41028f034e75a048226cce3bf96845a09
* | am c5fc6231: am 2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"Wink Saville2012-08-281-5/+16
|\ \ | |/ |/| | | | | * commit 'c5fc6231312b21efb601367bae28d63f9b26ac52': Fix memory leak in ApnSettings-activity
| * am 2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"Wink Saville2012-08-281-5/+16
| |\ | | | | | | | | | | | | * commit '2d6b52bd38046abe1761cf0cc1f0c415e4a24fef': Fix memory leak in ApnSettings-activity
| | * Merge "Fix memory leak in ApnSettings-activity"Wink Saville2012-08-281-5/+16
| | |\
| | | * Fix memory leak in ApnSettings-activityJack Wang2012-08-131-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When destroying the activity, the HandlerThread isnt stopped. This results in that the thread remains, and if you enter/exit the activity multiple times, you will end up with multiple threads and a small memory leak Change-Id: I4779d2625e6002b55066dd034c84d743b9f80ef5
* | | | am 300457ba: am 38ce5194: Merge "Enable to delete a stored persistent group ↵Jean-Baptiste Queru2012-08-283-1/+125
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 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-283-1/+125
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | 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-283-1/+125
| | |\ \
| | | * | Enable to delete a stored persistent group from p2p settings.Yoshihiko Ikenaga2012-08-283-1/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "Always-on VPN." into jb-mr1-devJeff Sharkey2012-08-276-26/+239
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Always-on VPN.Jeff Sharkey2012-08-266-26/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "Avoid re-creating a user when activity is resumed" into jb-mr1-devAmith Yamasani2012-08-251-0/+11
|\ \ \ \ \ \
| * | | | | | Avoid re-creating a user when activity is resumedAmith Yamasani2012-08-251-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | onCreate() was getting called again, resulting in another user being created. Keeping the new userid across pause/resume. Change-Id: Id7930227895e95a60a77efddf361ab9408a8f797
* | | | | | | Merge "Settings: Fix crash seen when setting the radio band" into jb-mr1-devAmith Yamasani2012-08-250-0/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Settings: Fix crash seen when setting the radio bandJeevaka Badrappan2012-08-251-1/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 41446512: am 52d996ed: Merge "Settings: Fix crash seen when setting the ↵Amith Yamasani2012-08-251-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | radio band" * commit '41446512cfa6e009187b7cc67fa34a29f82ddccc': Settings: Fix crash seen when setting the radio band
| * | | | am 52d996ed: Merge "Settings: Fix crash seen when setting the radio band"Amith Yamasani2012-08-251-1/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '52d996edeb7958d386bbf6655e9acfec3b10fdf2': Settings: Fix crash seen when setting the radio band
| | * | | Merge "Settings: Fix crash seen when setting the radio band"Amith Yamasani2012-08-251-1/+3
| | |\ \ \
| | | * | | Settings: Fix crash seen when setting the radio bandJeevaka Badrappan2012-08-171-1/+3
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | 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
* | | | | | Make settings a little aware of multi-user install.Dianne Hackborn2012-08-242-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id04f137dbc80dfee7b6c436efc2225ceccb88faa
* | | | | | Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-devJeff Sharkey2012-08-241-135/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Migrate legacy VPN arguments to system_server.Jeff Sharkey2012-08-241-135/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate the racoon and mtpd daemon arguments in system_server, instead of accepting them from Settings. Bug: 5756357 Change-Id: Ied048ca465aab03b2ae1c004388f49b82848b3f7
* | | | | | am 88f37936: am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation ↵Jean-Baptiste Queru2012-08-244-3/+52
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-234-3/+52
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | while MTP/PTP is active" * commit '1183f487c8ea8660415fcd30914844e8dc2de2bb': MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
| | * | | | Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP ↵Jean-Baptiste Queru2012-08-234-3/+52
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | is active"
| | | * | | | MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is activeLi Gang2012-08-104-3/+52
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2332-76/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9f722cc1c8451683f176ec7de9c62931426072f2 Auto-generated-cl: translation import
* | | | | | Merge "Show the license dialog only if the activity is still showing" into ↵Amith Yamasani2012-08-231-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
generated by cgit v1.1 at 2025-02-09 22:36:50 +0000