PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,304 Commits 1 Branch 0 Tags
bbe409d3ce08d5d463721bd23b76a65dc83d38d6
Commit Graph

3959 Commits

Author SHA1 Message Date
Nick Kralevich
994670d9ba am 61720061: am 7e7912de: ChooseLockPassword: allow spaces in passwords 
* commit '6172006184829f2da6e49de5609775e1caa41648':
  ChooseLockPassword: allow spaces in passwords
 2012-08-28 15:15:15 -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
d47fa79516 am e07b883a: am ca786f39: am c5fc6231: am 2d6b52bd: Merge "Fix memory leak in ApnSettings-activity" 
* commit 'e07b883a1a598f0cd9ccdd96c3eb6281c28c7ea0':
  Fix memory leak in ApnSettings-activity
 2012-08-28 13:02:36 -07:00
Jean-Baptiste Queru
747337322c 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.
 2012-08-28 13:02:25 -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
Jeff Sharkey
4e51f92120 am d1dbff36: am da40470d: Merge "Always-on VPN." into jb-mr1-dev 
* commit 'd1dbff362193c428bab38f189a041058650a7904':
  Always-on VPN.
 2012-08-27 15:17:24 -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
52a09754e0 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
 2012-08-25 22:12:55 -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
fcfc9900d9 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
 2012-08-25 13:01:51 -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
Dianne Hackborn
47401d924f am 15b07df7: am 2e3c7509: Make settings a little aware of multi-user install. 
* commit '15b07df79467aeabbe185a38397a90b2961a61b1':
  Make settings a little aware of multi-user install.
 2012-08-24 14:42:55 -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
3f5a277c3c 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.
 2012-08-24 11:36:31 -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
22ab662ad8 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
 2012-08-24 07:34:55 -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
Amith Yamasani
09c9671300 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
 2012-08-23 11:54:15 -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
d06529ee2e 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.
 2012-08-23 10:51:15 -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
Amith Yamasani
9d290115d4 am 9a53625b: am b18d58bd: Merge "Simplify User management settings to bare minimum" into jb-mr1-dev 
* commit '9a53625bd039abc5b08fd26e9d35e25c5268bfd1':
  Simplify User management settings to bare minimum
 2012-08-22 18:49:15 -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
53c4523f85 am aea749fa: am 9e0fdfec: Merge "Simplify proxy regex" into jb-mr1-dev 
* commit 'aea749fa94f9d1c0b5dd7c16247b8c2eeca23462':
  Simplify proxy regex
 2012-08-22 14:25:28 -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
Irfan Sheriff
fa8c1fc833 am 5a2dce60: am 50c1e5de: Merge "Update view on UI thread" into jb-mr1-dev 
* commit '5a2dce6092c9686f285652da42ca8d0556b7b17d':
  Update view on UI thread
 2012-08-22 12:19:01 -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
3be5dbf7da am 500421e6: am 395f5f70: Merge "Add a flag to control auto-brightness adjustment." into jb-mr1-dev 
* commit '500421e671de3853babec393a28569bf009e432d':
  Add a flag to control auto-brightness adjustment.
 2012-08-21 23:18:53 -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
8f97db22a9 am 5d8378c0: am 4641f4b5: am 997b1f74: am 578700af: Merge "Settings: disable Lock SIM card till response is received" 
* commit '5d8378c0bad90a7088e38ccb0d537b5d1a5efcdd':
  Settings: disable Lock SIM card till response is received
 2012-08-21 14:36:55 -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