PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,611 Commits 1 Branch 0 Tags
5a2dce6092c9686f285652da42ca8d0556b7b17d
Commit Graph

7611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
e696e53483 Reconcile with jb-mr1-release - do not merge 
Change-Id: Id59555adc024005fc53103e2006e987e72283811
 2012-08-21 16:07:03 -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
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
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
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
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
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
097593e553 am 5fdc5264: Import translations. DO NOT MERGE 
* commit '5fdc526426f6250bda522235a6db56548c89cb0a':
  Import translations. DO NOT MERGE
 2012-08-20 14:51:17 -07:00
Baligh Uddin
5fdc526426 Import translations. DO NOT MERGE 
Change-Id: Idd1ece233eb5daf32683069ca5daa04718769c87
Auto-generated-cl: translation import
 2012-08-20 10:35:09 -07:00
The Android Automerger
ee6bd99204 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-20 06:35:42 -07:00
Baligh Uddin
6e6a468c7f am c76bfb92: Import translations. DO NOT MERGE 
* commit 'c76bfb9243d7fae3f2f6f785685f709c28b41097':
  Import translations. DO NOT MERGE
 2012-08-17 15:57:59 -07:00
Baligh Uddin
c76bfb9243 Import translations. DO NOT MERGE 
Change-Id: Id94a81adfd0845198795a16aaeb3b29fe7db1807
Auto-generated-cl: translation import
 2012-08-17 12:09:22 -07:00
Jean-Baptiste Queru
db3262676e am b40815c1: am 71742eb1: am 0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected." 
* commit 'b40815c150fb3b4a53e7447d249316e3b3fc9502':
  UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
 2012-08-17 08:58:08 -07:00
Jean-Baptiste Queru
ba094d3fd3 am 43231f2d: am f4cc034e: am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up" 
* commit '43231f2d6edef60859ffd3d92d43afe48f5916f6':
  TetheringSetting: Keep Tethering checkbox unchecked until tethering up
 2012-08-17 08:58:07 -07:00
Jean-Baptiste Queru
b40815c150 am 71742eb1: am 0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected." 
* commit '71742eb13276e93d18f6aead10a8f767134ab0af':
  UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
 2012-08-17 08:57:04 -07:00
Jean-Baptiste Queru
43231f2d6e am f4cc034e: am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up" 
* commit 'f4cc034e8c61a05b3e99ca4f698b3fe6de21bc98':
  TetheringSetting: Keep Tethering checkbox unchecked until tethering up
 2012-08-17 08:57:03 -07:00
Jean-Baptiste Queru
71742eb132 am 0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected." 
* commit '0c869d694b59a55c8d53b57a12393b55530e798e':
  UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
 2012-08-17 08:55:52 -07:00
Jean-Baptiste Queru
f4cc034e8c am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up" 
* commit 'd61c23b3c20e990c34edfa5b257f558d479218cf':
  TetheringSetting: Keep Tethering checkbox unchecked until tethering up
 2012-08-17 08:55:51 -07:00
Jean-Baptiste Queru
0c869d694b Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected." 2012-08-17 08:51:18 -07:00
Jean-Baptiste Queru
d61c23b3c2 Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up" 2012-08-17 08:51:14 -07:00
The Android Open Source Project
f9b00a844d Reconcile with jb-mr1-release - do not merge 
Change-Id: I6e4530661a9c7119cc4082297def851f063112c7
 2012-08-16 19:11:13 -07:00
The Android Open Source Project
3270759700 am c8cd7d93: am 8543723f: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit 'c8cd7d9335863d19a0a37569a4a539f13ebd1858':
 2012-08-16 19:01:50 -07:00
The Android Open Source Project
c8cd7d9335 am 8543723f: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '8543723f37f6f8c42562e13d0ecaeeaa3a2d3e41':
 2012-08-16 18:59:04 -07:00
The Android Open Source Project
8543723f37 Reconcile with jb-mr0-release - do not merge 
Change-Id: Ie2c8260df9e0ee2206448b14f61be060206c22ba
 2012-08-16 18:57:02 -07:00
The Android Automerger
7a6674d1b1 merge in jb-mr0-release history after reset to jb-dev 2012-08-16 17:57:52 -07:00
Baligh Uddin
5694cd0058 am 61ddf10d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '61ddf10d63faa686fa0155c002f97732013390df':
  Import translations. DO NOT MERGE
 2012-08-16 15:03:08 -07:00
Baligh Uddin
61ddf10d63 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-16 15:01:28 -07:00
Baligh Uddin
77fd1d9431 Import translations. DO NOT MERGE 
Change-Id: Ia37da41da85a756cb59799c52efadf5289eeacf3
Auto-generated-cl: translation import
 2012-08-16 14:46:47 -07:00
Dianne Hackborn
2de17ff49a am bb06a427: Rename UserId to UserHandle. 
* commit 'bb06a427eb471227cf42a8078a54ca0581309493':
  Rename UserId to UserHandle.
 2012-08-16 12:51:41 -07:00
Dianne Hackborn
bb06a427eb Rename UserId to UserHandle. 
Change-Id: I04b86f3777c28fb83f03eb404dd5c2eb18d3da8f
 2012-08-16 12:47:09 -07:00
The Android Automerger
8bb5a08a6d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-16 06:34:38 -07:00
Baligh Uddin
acd44fb66b am 704ca026: Import translations. DO NOT MERGE 
* commit '704ca026e0919c9361859d755b1f3f4eb1315c64':
  Import translations. DO NOT MERGE
 2012-08-16 06:16:04 -07:00