PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,683 Commits 1 Branch 0 Tags
79bd0a75554f11ee85a690976da0f7644e025eda
Commit Graph

7683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Baligh Uddin
c6015d2f59 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-28 15:15:09 -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
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
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
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
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
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
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
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
Amith Yamasani
af71f2ac94 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
 2012-08-25 22:11:20 -07:00
Amith Yamasani
44120d19f3 Merge "Avoid re-creating a user when activity is resumed" into jb-mr1-dev 2012-08-25 22:09:53 -07:00
Amith Yamasani
07e3716b7e 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
 2012-08-25 21:55:24 -07:00
Amith Yamasani
b1491842c4 Merge "Settings: Fix crash seen when setting the radio band" into jb-mr1-dev 2012-08-25 21:52:39 -07:00
Jeevaka Badrappan
cf6d99aac1 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
 2012-08-25 21:50:26 -07:00
Amith Yamasani
d3d801c9a9 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
 2012-08-25 13:00:19 -07:00
Amith Yamasani
5e61ba5576 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
 2012-08-25 12:58:18 -07:00
Amith Yamasani
41446512cf am 52d996ed: Merge "Settings: Fix crash seen when setting the radio band" 
* commit '52d996edeb7958d386bbf6655e9acfec3b10fdf2':
  Settings: Fix crash seen when setting the radio band
 2012-08-25 12:56:23 -07:00
Amith Yamasani
52d996edeb Merge "Settings: Fix crash seen when setting the radio band" 2012-08-25 11:55:42 -07:00
Amith Yamasani
92e2b4f4af 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
 2012-08-25 07:47:43 -07:00
The Android Open Source Project
aecda4950b Reconcile with jb-mr1-release - do not merge 
Change-Id: If68758d7bb648f89c4a663ca6bcc419f380518e8
 2012-08-25 07:17:23 -07:00
Baligh Uddin
8bd1a3234a am cf033092: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'cf033092732809d1ea0734f1f761617a8c4ccd32':
  Import translations. DO NOT MERGE
 2012-08-24 15:05:21 -07:00
Baligh Uddin
cf03309273 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-24 15:03:15 -07:00
Dianne Hackborn
15b07df794 am 2e3c7509: Make settings a little aware of multi-user install. 
* commit '2e3c75094bde1cfca1b15f66f5ff3d0a85baf0a0':
  Make settings a little aware of multi-user install.
 2012-08-24 14:40:15 -07:00
Baligh Uddin
7b139fa097 Import translations. DO NOT MERGE 
Change-Id: I8087ddd4451aef7aa8b07a1ab4019aab89723d8d
Auto-generated-cl: translation import
 2012-08-24 13:29:14 -07:00
Dianne Hackborn
2e3c75094b Make settings a little aware of multi-user install. 
Change-Id: Id04f137dbc80dfee7b6c436efc2225ceccb88faa
 2012-08-24 13:13:46 -07:00
Jeff Sharkey
841c492eda am f3de41a2: Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev 
* commit 'f3de41a24d779c9fae6517ceb13596290076b600':
  Migrate legacy VPN arguments to system_server.
 2012-08-24 11:34:17 -07:00
Jeff Sharkey
f3de41a24d Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev 2012-08-24 11:33:02 -07:00
Jeff Sharkey
745e6212e7 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
 2012-08-24 11:17:57 -07:00
Jean-Baptiste Queru
f741006e7e 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
 2012-08-24 07:32:22 -07:00
Jean-Baptiste Queru
534529d0cc 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
 2012-08-24 07:29:43 -07:00
Baligh Uddin
ebf1a4cc6a am a5c6d6b3: Import translations. DO NOT MERGE 
* commit 'a5c6d6b32f2a5fe562dd77389d26c03c4b6f2e51':
  Import translations. DO NOT MERGE
 2012-08-23 18:58:28 -07:00
Baligh Uddin
a5c6d6b32f Import translations. DO NOT MERGE 
Change-Id: I9f722cc1c8451683f176ec7de9c62931426072f2
Auto-generated-cl: translation import
 2012-08-23 18:11:17 -07:00
Amith Yamasani
36bbd58cff Show the license dialog only if the activity is still showing 
Bug: 6888990
Change-Id: Ide267739c7fd296356f26293f02bd794906fbd0a
 2012-08-23 14:20:31 -07:00
Amith Yamasani
b7808c7187 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
 2012-08-23 11:30:45 -07:00