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

8072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
b35a9b6811 Merge "Import translations. DO NOT MERGE" 2012-08-22 19:38:22 -07: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
9a53625bd0 am b18d58bd: Merge "Simplify User management settings to bare minimum" into jb-mr1-dev 
* commit 'b18d58bdf5501a50d4a2d726c875676b16a657e2':
  Simplify User management settings to bare minimum
 2012-08-22 18:47:11 -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
The Android Open Source Project
680705bed4 am f1a3161e: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'f1a3161ef3b51226ddea9b81eb673bb127a953fa':
 2012-08-22 15:39:54 -07:00
The Android Open Source Project
f1a3161ef3 Reconcile with jb-mr1-release - do not merge 
Change-Id: I85140e245de7ea2f1cb63252294e4cfe71b8006e
 2012-08-22 15:36:24 -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
aea749fa94 am 9e0fdfec: Merge "Simplify proxy regex" into jb-mr1-dev 
* commit '9e0fdfec70f181ec71198822fa39e749248c5f87':
  Simplify proxy regex
 2012-08-22 14:24:20 -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
ee1a2a65e5 Import translations. DO NOT MERGE 
Change-Id: Iefc2d9fb4059b9ffb4a1e08d0269907ce7ca73cc
Auto-generated-cl: translation import
 2012-08-22 13:01:07 -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
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
5a2dce6092 am 50c1e5de: Merge "Update view on UI thread" into jb-mr1-dev 
* commit '50c1e5dee8e45edf8f7593c722399735659127e7':
  Update view on UI thread
 2012-08-22 12:17:13 -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
The Android Automerger
783482f410 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-22 06:34:22 -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
500421e671 am 395f5f70: Merge "Add a flag to control auto-brightness adjustment." into jb-mr1-dev 
* commit '395f5f700718aac811ea8216fdb60bdd08452553':
  Add a flag to control auto-brightness adjustment.
 2012-08-21 23:17:06 -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
The Android Open Source Project
7e0bcb084d am e696e534: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'e696e53483068dd6bd0aa0ccde42bc1a1b75d336':
 2012-08-21 16:09:57 -07:00
The Android Open Source Project
e696e53483 Reconcile with jb-mr1-release - do not merge 
Change-Id: Id59555adc024005fc53103e2006e987e72283811
 2012-08-21 16:07:03 -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
5d8378c0ba am 4641f4b5: am 997b1f74: am 578700af: Merge "Settings: disable Lock SIM card till response is received" 
* commit '4641f4b53790ad1ff6c6c1c17951b6b200a3f07c':
  Settings: disable Lock SIM card till response is received
 2012-08-21 14:35:54 -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
Baligh Uddin
f42c9cf853 Merge "Import translations. DO NOT MERGE" 2012-08-21 12:49:43 -07:00
Baligh Uddin
f39ce2cbd3 am ccc71934: (-s ours) am d75b776a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'ccc7193490db24fe6346a6023686cdd708301975':
  Import translations. DO NOT MERGE
 2012-08-21 12:00:49 -07:00
Baligh Uddin
ccc7193490 am d75b776a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'd75b776a7c2cb741793cfa5d1af524db96b738ef':
  Import translations. DO NOT MERGE
 2012-08-21 11:58:52 -07:00
Baligh Uddin
8bb1195431 Import translations. DO NOT MERGE 
Change-Id: I6f68180aa2dfc4b252a060afad0cb7f52f914548
Auto-generated-cl: translation import
 2012-08-21 11:58:35 -07:00
Baligh Uddin
d75b776a7c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-21 11:57:12 -07:00
Baligh Uddin
8844edf98a Import translations. DO NOT MERGE 
Change-Id: I4beb9abb9778e82144be702dbab151a9e47f9c4e
Auto-generated-cl: translation import
 2012-08-21 11:55:13 -07:00
Dianne Hackborn
7798f3c7eb am 5a91b134: am d44b53e3: Merge "Make manage apps UI multi-user aware." into jb-mr1-dev 
* commit '5a91b13426f55d2289e25dda2c1ade769cb10bec':
  Make manage apps UI multi-user aware.
 2012-08-21 11:23:02 -07:00
Dianne Hackborn
5a91b13426 am d44b53e3: Merge "Make manage apps UI multi-user aware." into jb-mr1-dev 
* commit 'd44b53e37abed9632d30df37259b3efcb10332aa':
  Make manage apps UI multi-user aware.
 2012-08-21 11:21:11 -07:00
Dianne Hackborn
d44b53e37a Merge "Make manage apps UI multi-user aware." into jb-mr1-dev 2012-08-21 11:19:17 -07:00
Dianne Hackborn
271c8b06c2 Make manage apps UI multi-user aware. 
The details screens still need some work.

Change-Id: I850cc9ba9a8db7787fae629ae3cb6c6772c726f5
 2012-08-21 11:14:04 -07:00
The Android Automerger
65586bf0b4 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-21 06:35:02 -07:00
Jeevaka Badrappan
48c0383125 Settings: disable Lock SIM card till response is received 
Lock SIM card checkbox is enabled always which results in
allowing the user to change the state even before the
previous change has been completed successfully. Due to
this option, UI ends up in state where it can send
disable Lock SIM card twice resulting in operation
not allowed error from modem.

Change-Id: I0f4a344a8d76720e75accf3a763c3d0e940a0dca
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: 9954
 2012-08-21 17:00:22 +08:00
Jake Hamby
3a4177c940 am 785a81ee: am 0141872d: am 0de311b4: am c46455ac: Merge "Enable "APN roaming protocol" for all platforms" 
* commit '785a81ee2b3a34e5af8b3ad4714e2126ab032fb8':
  Enable "APN roaming protocol" for all platforms
 2012-08-20 18:11:34 -07:00
Jake Hamby
785a81ee2b am 0141872d: am 0de311b4: am c46455ac: Merge "Enable "APN roaming protocol" for all platforms" 
* commit '0141872d29945e85733eee74222d207ff9b80608':
  Enable "APN roaming protocol" for all platforms
 2012-08-20 18:09:40 -07:00
Jake Hamby
0141872d29 am 0de311b4: am c46455ac: Merge "Enable "APN roaming protocol" for all platforms" 
* commit '0de311b4956acc6ec05d25707f1075c1b8a38280':
  Enable "APN roaming protocol" for all platforms
 2012-08-20 18:08:02 -07:00
Jake Hamby
0de311b495 am c46455ac: Merge "Enable "APN roaming protocol" for all platforms" 
* commit 'c46455ac7a2ad988700f975bb07558c8580bbe8e':
  Enable "APN roaming protocol" for all platforms
 2012-08-20 18:06:25 -07:00
Jake Hamby
c46455ac7a Merge "Enable "APN roaming protocol" for all platforms" 2012-08-20 17:27:36 -07:00
Brian Muramatsu
e64c8a5e3a am 391e125a: am e54660d8: Merge "display wireless charging status" into jb-mr1-dev 
* commit '391e125a111b1eadfa3bd88956f7d71dce99dbda':
  display wireless charging status
 2012-08-20 17:01:23 -07:00
Brian Muramatsu
391e125a11 am e54660d8: Merge "display wireless charging status" into jb-mr1-dev 
* commit 'e54660d8b66e5c3aebbeefbb727386602714c621':
  display wireless charging status
 2012-08-20 16:59:50 -07:00
Brian Muramatsu
e54660d8b6 Merge "display wireless charging status" into jb-mr1-dev 2012-08-20 16:58:31 -07:00
Baligh Uddin
22530a1622 am 097593e5: (-s ours) am 5fdc5264: Import translations. DO NOT MERGE 
* commit '097593e553a3c2da956c6470c3b099dff568bb52':
  Import translations. DO NOT MERGE
 2012-08-20 14:52:52 -07:00