PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,560 Commits 1 Branch 0 Tags
2dff5b109b9dd4b55cb64d89ff55c56318052b5c
Commit Graph

7560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
2dff5b109b Merge "New dream settings - first cut" into jb-mr1-dev 2012-08-29 15:55:25 -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
c6015d2f59 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-28 15:15:09 -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
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
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
786aacb796 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-27 16:03:31 -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
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
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
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
Baligh Uddin
cf03309273 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-24 15:03: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
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
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
a5c6d6b32f Import translations. DO NOT MERGE 
Change-Id: I9f722cc1c8451683f176ec7de9c62931426072f2
Auto-generated-cl: translation import
 2012-08-23 18:11:17 -07:00
Amith Yamasani
6413d9658b Merge "Show the license dialog only if the activity is still showing" into jb-mr1-dev 2012-08-23 11:28:07 -07:00
Amith Yamasani
cd98f810f5 Show the license dialog only if the activity is still showing 
Bug: 6888990
Change-Id: Ide267739c7fd296356f26293f02bd794906fbd0a
 2012-08-23 11:25:18 -07:00
John Spurlock
05b5097d18 Merge "Settings: Minimal refactor to support new dreams api." into jb-mr1-dev 2012-08-23 10:47:16 -07:00
Jean-Baptiste Queru
88f379367f 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
 2012-08-23 09:47:04 -07:00
Jean-Baptiste Queru
1183f487c8 Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active" 2012-08-23 09:31:36 -07:00
John Spurlock
e5a84b2ea1 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
 2012-08-23 10:21:50 -04:00
Baligh Uddin
e3a49d7665 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-22 19:39:05 -07:00
Amith Yamasani
b18d58bdf5 Merge "Simplify User management settings to bare minimum" into jb-mr1-dev 2012-08-22 18:45:52 -07:00
Amith Yamasani
8e79d3ec80 Simplify User management settings to bare minimum 
No need to restrictions or account association at this time.

Change-Id: Ic4ae43d5bb9d4308e67499495d44c12de9e61777
 2012-08-22 18:43:54 -07:00
Irfan Sheriff
9e0fdfec70 Merge "Simplify proxy regex" into jb-mr1-dev 2012-08-22 14:21:41 -07:00
Irfan Sheriff
e8d4f2f98b Simplify proxy regex 
Bug: 6950756
Change-Id: I535be03073cf9f502631498939c841f88fb1617d
 2012-08-22 14:19:52 -07:00
Baligh Uddin
3a61dea4bf Import translations. DO NOT MERGE 
Change-Id: I8a85d98874da3ff59642198c05dccfe50974fdcd
Auto-generated-cl: translation import
 2012-08-22 12:58:12 -07:00
Irfan Sheriff
50c1e5dee8 Merge "Update view on UI thread" into jb-mr1-dev 2012-08-22 11:57:18 -07:00
Irfan Sheriff
21d07b954a Update view on UI thread 
Bug: 6970872
Change-Id: I05bec7cb8a8292de522cbfe11c0ecd5a79375014
 2012-08-22 11:37:20 -07:00
Jeff Brown
395f5f7007 Merge "Add a flag to control auto-brightness adjustment." into jb-mr1-dev 2012-08-21 23:15:26 -07:00
Jeff Brown
9674b32324 Add a flag to control auto-brightness adjustment. 
The feature is still disabled, it's just disabled using
a flag now.

Change-Id: I43ceaa5ab9b7252e3882c8b2d48c9844afb806c3
 2012-08-21 21:13:48 -07:00
Jean-Baptiste Queru
4641f4b537 am 997b1f74: am 578700af: Merge "Settings: disable Lock SIM card till response is received" 
* commit '997b1f74c49314162635c5976fa369dfcd3385fb':
  Settings: disable Lock SIM card till response is received
 2012-08-21 14:34:56 -07:00
Jean-Baptiste Queru
997b1f74c4 am 578700af: Merge "Settings: disable Lock SIM card till response is received" 
* commit '578700afb1f14c7b3a0ab8c7daa7a1e94628c1cb':
  Settings: disable Lock SIM card till response is received
 2012-08-21 14:33:50 -07:00
Jean-Baptiste Queru
578700afb1 Merge "Settings: disable Lock SIM card till response is received" 2012-08-21 13:40:29 -07:00