PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,045 Commits 1 Branch 0 Tags
e4f249bb7a9f999633d938d0c519631764bf969c
Commit Graph

8045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
The Android Automerger
4eccbcab6a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-28 06:34:26 -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
ece9b66e66 am 8e891823: (-s ours) am 786aacb7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '8e89182392e867b35729d01c4e3e45f5dff6d7f9':
  Import translations. DO NOT MERGE
 2012-08-27 16:08:59 -07: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
Baligh Uddin
0d33b292d0 Merge "Import translations. DO NOT MERGE" 2012-08-27 16:03:10 -07: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
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
43a48736c8 Import translations. DO NOT MERGE 
Change-Id: Id789c1dba9f7f331cf985d1470a68161e770ac84
Auto-generated-cl: translation import
 2012-08-27 15:11:32 -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
The Android Automerger
c37c13a7bf merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-27 06:34:49 -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
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
fd7aa8d4b2 am 07e3716b: am b1491842: Merge "Settings: Fix crash seen when setting the radio band" into jb-mr1-dev 
* commit '07e3716b7e485982b9b024249d2f7a9b09e529df':
  Settings: Fix crash seen when setting the radio band
 2012-08-25 21:56:54 -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
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
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
583f62f75e am aecda495: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'aecda4950b9ef92285bb1755183c2b10e6c2c2c5':
  Show the license dialog only if the activity is still showing
 2012-08-25 07:21:30 -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
e286d7dead am 8bd1a323: (-s ours) am cf033092: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '8bd1a3234ac81bc3d26de72647ad611615273f62':
  Import translations. DO NOT MERGE
 2012-08-24 15:06:58 -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
Baligh Uddin
56d7fa5ed5 Merge "Import translations. DO NOT MERGE" 2012-08-24 15:02:56 -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
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
eb6f32285c Import translations. DO NOT MERGE 
Change-Id: I283e428d001ac5b313bc01836db8f1519f29d33f
Auto-generated-cl: translation import
 2012-08-24 13:32:09 -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
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
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