PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,663 Commits 1 Branch 0 Tags
0694de939724a497f2f1ed86ba83c11a5710e80c
Commit Graph

21663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xinhe
30552566f7 am 5dee645c: am d55ddc33: Merge "if do not turn on wifi STA or SAP, there is no 5GHz choice for SAP config" into mnc-dev 
* commit '5dee645cd6e909a014c8cf1538fc0c96190e09b3':
  if do not turn on wifi STA or SAP, there is no 5GHz choice  for SAP config
 2015-06-23 03:12:55 +00:00
Sanket Padawe
088c6d68c2 am 2bed3a50: Merge "Align Enlish words to RTL in RTL context in networkreset Settings." into mnc-dev 
* commit '2bed3a507faaab29569857fd7a92b739faa31ee3':
  Align Enlish words to RTL in RTL context in networkreset Settings.
 2015-06-23 02:57:29 +00:00
Sanket Padawe
2bed3a507f Merge "Align Enlish words to RTL in RTL context in networkreset Settings." into mnc-dev 2015-06-23 02:47:28 +00:00
Sanket Padawe
bf91bc6bd3 Align Enlish words to RTL in RTL context in networkreset Settings. 
Bug: 21553326
Change-Id: I216723172cc6998e1432d0a066f21a72afe1bc27
 2015-06-22 19:46:28 -07:00
Sanket Padawe
a8c6cb5a72 am 4044d6cd: Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev 
* commit '4044d6cdd6309e06377ae57a4b941f2db87d6942':
  Fix display of "Contact sharing" option in Car kit for BT Settings.
 2015-06-23 00:43:57 +00:00
Sanket Padawe
4044d6cdd6 Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev 2015-06-23 00:34:37 +00:00
xinhe
5dee645cd6 am d55ddc33: Merge "if do not turn on wifi STA or SAP, there is no 5GHz choice for SAP config" into mnc-dev 
* commit 'd55ddc337edd7236a7024602b7970e146f9489db':
  if do not turn on wifi STA or SAP, there is no 5GHz choice  for SAP config
 2015-06-23 00:20:09 +00:00
xinhe
d55ddc337e Merge "if do not turn on wifi STA or SAP, there is no 5GHz choice for SAP config" into mnc-dev 2015-06-22 23:56:11 +00:00
xinhe
5a0d83b11e if do not turn on wifi STA or SAP, there is no 5GHz choice 
for SAP config

b/22008176

Change-Id: Id1020f975bce1ff7a3c738c4180f3d7686718d82
 2015-06-22 15:55:28 -07:00
Alan Viverette
be0c398cda am 270353f6: am 8a4e44ba: Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev 
* commit '270353f659c2b6bdcf58c16f087c6e5cff810875':
  Ensure "default" and "none" caption colors are consistent w/ framework
 2015-06-22 21:13:48 +00:00
Makoto Onuki
7ee9e16d84 am 1e998fd6: am b544ce78: Merge "Set service name to printer service setting title" into mnc-dev 
* commit '1e998fd6a8c49ac8ab776647533c8391cd17ab94':
  Set service name to printer service setting title
 2015-06-22 21:13:47 +00:00
Alan Viverette
270353f659 am 8a4e44ba: Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev 
* commit '8a4e44ba92d2c7552860d7e8d23015c013da32f4':
  Ensure "default" and "none" caption colors are consistent w/ framework
 2015-06-22 21:01:57 +00:00
Makoto Onuki
1e998fd6a8 am b544ce78: Merge "Set service name to printer service setting title" into mnc-dev 
* commit 'b544ce78dc63b9119dcc741d18200f3128d42aa3':
  Set service name to printer service setting title
 2015-06-22 21:01:56 +00:00
Alan Viverette
8a4e44ba92 Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev 2015-06-22 20:55:15 +00:00
Makoto Onuki
b544ce78dc Merge "Set service name to printer service setting title" into mnc-dev 2015-06-22 20:47:59 +00:00
Makoto Onuki
077a7173c6 Set service name to printer service setting title 
Bug 21899319

Change-Id: I940957dd4036eb3386c7f59fbbd3608e7169f415
 2015-06-22 13:43:49 -07:00
Alan Viverette
751625e9a2 Ensure "default" and "none" caption colors are consistent w/ framework 
Also enables scroll indicators in color grid dialog.

Bug: 21602597
Change-Id: I7fabd36787fc8689966eb8dcece3d4d047ee8066
 2015-06-22 13:05:45 -07:00
Sanket Padawe
53e74f510b Fix display of "Contact sharing" option in Car kit for BT Settings. 
Bug: 21879473
Change-Id: I0d2f839c525d2a5179f9ef59ab12a94f1aab9b6f
 2015-06-22 12:33:53 -07:00
Alan Viverette
6d11da55a8 am e7924ca8: am 14f5da9b: Merge "Disable foreground opacity when using default foreground color" into mnc-dev 
* commit 'e7924ca819ff7894214b935013a31d42cb95db8d':
  Disable foreground opacity when using default foreground color
 2015-06-22 17:41:27 +00:00
Barnaby James
9465367cbf am 83f3ef2c: am ab1c2b0d: Merge "Hide title of the zen mode voice activity." into mnc-dev 
* commit '83f3ef2cfe3b015b335ad5b49a5ad69e4be074a6':
  Hide title of the zen mode voice activity.
 2015-06-22 17:41:26 +00:00
Alan Viverette
e7924ca819 am 14f5da9b: Merge "Disable foreground opacity when using default foreground color" into mnc-dev 
* commit '14f5da9b4d2cb1e0b6828312613bf8f4c8a1df2d':
  Disable foreground opacity when using default foreground color
 2015-06-22 17:27:31 +00:00
Barnaby James
83f3ef2cfe am ab1c2b0d: Merge "Hide title of the zen mode voice activity." into mnc-dev 
* commit 'ab1c2b0d8097396fd67045f52829703e84e73350':
  Hide title of the zen mode voice activity.
 2015-06-22 17:27:30 +00:00
Alan Viverette
14f5da9b4d Merge "Disable foreground opacity when using default foreground color" into mnc-dev 2015-06-22 17:20:07 +00:00
Barnaby James
ab1c2b0d80 Merge "Hide title of the zen mode voice activity." into mnc-dev 2015-06-22 17:18:21 +00:00
Alan Viverette
529901decd Disable foreground opacity when using default foreground color 
Bug: 21602597
Change-Id: Idad5288477f9ece46a2ccb768863d4fd528fec12
 2015-06-22 10:07:19 -07:00
Barnaby James
f9472beb96 Hide title of the zen mode voice activity. 
Zen mode voice activity doesn't show any UI but the activity title is still shown.

BUG: 21985804
Change-Id: I1e7bd07deb59bcb36005fa7e4bca766af03d742b
 2015-06-22 09:53:37 -07:00
Geoff Mendal
59558bdad7 am cb35e5a7: (-s ours) am e4841b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'cb35e5a718f8c716dc476d13ad0f39c1815f87d0':
  Import translations. DO NOT MERGE
 2015-06-22 15:54:29 +00:00
Jason Monk
591aa6ae9e am d8c811d8: am b4b590d1: Merge "Update disable dialog" into mnc-dev 
* commit 'd8c811d8b80d251630303afda518c8407424abae':
  Update disable dialog
 2015-06-22 15:54:26 +00:00
Geoff Mendal
cb35e5a718 am e4841b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'e4841b38d05eba058061651b11020c551a014914':
  Import translations. DO NOT MERGE
 2015-06-22 15:38:50 +00:00
Geoff Mendal
e4841b38d0 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-22 15:31:26 +00:00
Jason Monk
d8c811d8b8 am b4b590d1: Merge "Update disable dialog" into mnc-dev 
* commit 'b4b590d13f4ddd2ae5ffd099eb93ad8fa647ec57':
  Update disable dialog
 2015-06-22 15:02:15 +00:00
Geoff Mendal
b593d12bea Import translations. DO NOT MERGE 
Change-Id: I2c01af1003b67115a748fbe8ba3a7ec2d82144a8
Auto-generated-cl: translation import
 2015-06-22 08:00:38 -07:00
Jason Monk
b4b590d13f Merge "Update disable dialog" into mnc-dev 2015-06-22 14:55:14 +00:00
Pavel Zhamaitsiak
bfa2bf654b am a8491f34: am 5a6d17c8: Log WiFi Calling actions from settings 
* commit 'a8491f348ef1a1f10278a83bb33b2b38723fb30c':
  Log WiFi Calling actions from settings
 2015-06-22 03:54:39 +00:00
Pavel Zhamaitsiak
a8491f348e am 5a6d17c8: Log WiFi Calling actions from settings 
* commit '5a6d17c8cdb099b8533fb4c12c23d31da4bafe41':
  Log WiFi Calling actions from settings
 2015-06-22 03:43:31 +00:00
Pavel Zhamaitsiak
5a6d17c8cd Log WiFi Calling actions from settings 
Change-Id: Ie18bf18de22469f9b2615ba19f088316d20464d7
 2015-06-20 15:49:08 -07:00
Adrian Roos
e14151f9c9 am 5023c89d: am a029671b: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev 
* commit '5023c89d24723f1fc8e5b176fab476d80484b974':
  Work around improper ListView recycling in TrustAgentSettings
 2015-06-20 03:41:02 +00:00
Selim Cinek
d49930c28f am e4daef16: am 5f0976a0: Merge "Fixed a crash when rotating the Fingerprint renaming dialog" into mnc-dev 
* commit 'e4daef16c573913fdac8aaf79acb0754004d53d5':
  Fixed a crash when rotating the Fingerprint renaming dialog
 2015-06-20 03:41:01 +00:00
Adrian Roos
5023c89d24 am a029671b: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev 
* commit 'a029671bfd2d915ce6d43fa31a896058454cfe24':
  Work around improper ListView recycling in TrustAgentSettings
 2015-06-20 03:28:00 +00:00
Selim Cinek
e4daef16c5 am 5f0976a0: Merge "Fixed a crash when rotating the Fingerprint renaming dialog" into mnc-dev 
* commit '5f0976a0ac1054d59133e6f5661b50c4e9dcecfe':
  Fixed a crash when rotating the Fingerprint renaming dialog
 2015-06-20 03:27:59 +00:00
Adrian Roos
a029671bfd Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev 2015-06-20 03:23:03 +00:00
Selim Cinek
5f0976a0ac Merge "Fixed a crash when rotating the Fingerprint renaming dialog" into mnc-dev 2015-06-20 03:21:21 +00:00
Adrian Roos
ba59f5b222 Work around improper ListView recycling in TrustAgentSettings 
Previously, the views for our SwitchPreference would never
be recycled because they weren't present in onCreate, which
broke accessibility events.

Bug: 21837103
Change-Id: I01f40b4e6df6d807b77f985116a57334e4ca4868
 2015-06-19 20:01:56 -07:00
Robin Lee
645c4e327c am 02a0cf3a: am 3a839be7: Merge "Only unregister the network callback at onPause" into mnc-dev 
* commit '02a0cf3ae32a272eff23364f8202f6086fabd28e':
  Only unregister the network callback at onPause
 2015-06-19 21:23:00 +00:00
Selim Cinek
f4a305ee40 Fixed a crash when rotating the Fingerprint renaming dialog 
Bug: 21815069
Change-Id: Ice90a5786685c300a522a908c1107af9e5311eb3
 2015-06-19 13:15:13 -07:00
Robin Lee
02a0cf3ae3 am 3a839be7: Merge "Only unregister the network callback at onPause" into mnc-dev 
* commit '3a839be7c165ea152179fb5b4531f4f6fdb7c822':
  Only unregister the network callback at onPause
 2015-06-19 20:10:51 +00:00
Robin Lee
3a839be7c1 Merge "Only unregister the network callback at onPause" into mnc-dev 2015-06-19 20:03:06 +00:00
Jason Monk
9c4c45b340 am 6a7c7562: am d63e6969: Merge "Add content description to owner info status text" into mnc-dev 
* commit '6a7c756208555a41b4433b3a0ce12ef1c101215c':
  Add content description to owner info status text
 2015-06-19 16:15:37 +00:00
John Spurlock
5a148d1bc2 am b9ea1310: am 7699cad0: Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev 
* commit 'b9ea1310441d8602b4a51e1c1746e88e45dbc745':
  Settings: Add widget entry point to magical entry points listing.
 2015-06-19 16:15:25 +00:00
Jason Monk
6a7c756208 am d63e6969: Merge "Add content description to owner info status text" into mnc-dev 
* commit 'd63e696902cbefaa7361aaa16e6b20d0fe593cdb':
  Add content description to owner info status text
 2015-06-19 15:33:37 +00:00