Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,540 Commits 1 Branch 0 Tags
e50a15965c4e34ac55406bf0e7bdd68488971360
Commit Graph

8882 Commits

Author SHA1 Message Date
xinhe
e50a15965c am 30552566: 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 '30552566f7d349af7a7629aad8f7d5c89c614086':
  if do not turn on wifi STA or SAP, there is no 5GHz choice  for SAP config
 2015-06-23 04:38:33 +00:00
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
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
3a1e634a59 am be0c398c: am 270353f6: am 8a4e44ba: Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev 
* commit 'be0c398cdac1a4441e15e4cbc806dc23286de85d':
  Ensure "default" and "none" caption colors are consistent w/ framework
 2015-06-22 21:57:00 +00:00
Makoto Onuki
981eec6668 am 7ee9e16d: am 1e998fd6: am b544ce78: Merge "Set service name to printer service setting title" into mnc-dev 
* commit '7ee9e16d84b03557416f203e91975b111afdcdfe':
  Set service name to printer service setting title
 2015-06-22 21:56:59 +00: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
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
Jason Monk
e09535541d am 591aa6ae: am d8c811d8: am b4b590d1: Merge "Update disable dialog" into mnc-dev 
* commit '591aa6ae9ed7bd254df849fd154ce2de70eb60c1':
  Update disable dialog
 2015-06-22 16:07:16 +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
Jason Monk
b4b590d13f Merge "Update disable dialog" into mnc-dev 2015-06-22 14:55:14 +00:00
Pavel Zhamaitsiak
8e3ce3da36 am bfa2bf65: am a8491f34: am 5a6d17c8: Log WiFi Calling actions from settings 
* commit 'bfa2bf654b3391349f8e16d846df45da2177192a':
  Log WiFi Calling actions from settings
 2015-06-22 04:06:20 +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
5a6d17c8cd Log WiFi Calling actions from settings 
Change-Id: Ie18bf18de22469f9b2615ba19f088316d20464d7
 2015-06-20 15:49:08 -07:00
Adrian Roos
952471b0e3 am e14151f9: am 5023c89d: am a029671b: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev 
* commit 'e14151f9c9761d4ccecb9fc677f7b291d287d8e0':
  Work around improper ListView recycling in TrustAgentSettings
 2015-06-20 05:44:35 +00:00
Selim Cinek
23731e5339 am d49930c2: am e4daef16: am 5f0976a0: Merge "Fixed a crash when rotating the Fingerprint renaming dialog" into mnc-dev 
* commit 'd49930c28f9c1724fefb7cc986e6ddd5a060b1bd':
  Fixed a crash when rotating the Fingerprint renaming dialog
 2015-06-20 05:44:33 +00: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
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
b745831e3f am 645c4e32: am 02a0cf3a: am 3a839be7: Merge "Only unregister the network callback at onPause" into mnc-dev 
* commit '645c4e327cda52b5dbc9560aece66edb075d7658':
  Only unregister the network callback at onPause
 2015-06-19 21:40:34 +00: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
3a839be7c1 Merge "Only unregister the network callback at onPause" into mnc-dev 2015-06-19 20:03:06 +00:00
Jason Monk
0591282f2a am 9c4c45b3: am 6a7c7562: am d63e6969: Merge "Add content description to owner info status text" into mnc-dev 
* commit '9c4c45b34013514b4f8a734b3f8d146dc613e46b':
  Add content description to owner info status text
 2015-06-19 16:26:37 +00:00
John Spurlock
7eb1906fcc am 5a148d1b: am b9ea1310: am 7699cad0: Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev 
* commit '5a148d1bc210256c74d45e25cae59f5eb27c931b':
  Settings: Add widget entry point to magical entry points listing.
 2015-06-19 16:26:36 +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
d63e696902 Merge "Add content description to owner info status text" into mnc-dev 2015-06-19 15:22:21 +00:00
Jason Monk
2e78f53af1 Add content description to owner info status text 
Bug: 21799551
Change-Id: I8fe82d304309949a5a46492f7d20c58e006baea3
 2015-06-19 11:17:03 -04:00
John Spurlock
533a5664da Settings: Add widget entry point to magical entry points listing. 
Bug: 21930077
Change-Id: I67b05d6064a2ab0fe93d3d8841c9f23c9246a101
 2015-06-19 10:47:36 -04:00
Jason Monk
8af26277a3 am 8a753643: am 5fd5890f: am 47a26c79: Merge "Fix ListView being too eager too scroll" into mnc-dev 
* commit '8a753643058760fb44a286dbf7d198053a3f3a01':
  Fix ListView being too eager too scroll
 2015-06-18 20:43:09 +00:00
Jason Monk
8a75364305 am 5fd5890f: am 47a26c79: Merge "Fix ListView being too eager too scroll" into mnc-dev 
* commit '5fd5890f5b94d102d7cf655fd0d1dbd9d09dd55f':
  Fix ListView being too eager too scroll
 2015-06-18 20:30:36 +00:00
Jason Monk
47a26c7928 Merge "Fix ListView being too eager too scroll" into mnc-dev 2015-06-18 20:07:40 +00:00
Jason Monk
66aa964e2a Fix ListView being too eager too scroll 
ListView is always too eager to scroll, so just stop using it.

Bug: 21853796
Change-Id: Id37d89b0312597a9fb65a33f151af34b3f395d91
 2015-06-18 15:56:21 -04:00
Jason Monk
feaae6959a am aa5964de: am beaae836: am 6c5b27e0: Merge "Fix opening secured networks from QS" into mnc-dev 
* commit 'aa5964de3768703de9dfa88fb7aa66ece7a353fe':
  Fix opening secured networks from QS
 2015-06-18 19:55:32 +00:00
Jason Monk
aa5964de37 am beaae836: am 6c5b27e0: Merge "Fix opening secured networks from QS" into mnc-dev 
* commit 'beaae8367ad41ff20ada95e621e488384b1730e3':
  Fix opening secured networks from QS
 2015-06-18 19:37:34 +00:00
Jason Monk
6c5b27e042 Merge "Fix opening secured networks from QS" into mnc-dev 2015-06-18 19:19:12 +00:00
Alex Chau
3fb2e54ace am ee6ffccb: am 1e24271a: am cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev 
* commit 'ee6ffccbc7ff4015597da1fcc725456117a3141c':
  Enforce Keyguard policy in Notification Settings
 2015-06-18 17:47:27 +00:00
Alex Chau
ee6ffccbc7 am 1e24271a: am cd0da9c1: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev 
* commit '1e24271a9bee773911b630637c7096613d825a27':
  Enforce Keyguard policy in Notification Settings
 2015-06-18 17:35:55 +00:00
Alex Chau
cd0da9c14e Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev 2015-06-18 17:10:35 +00:00
Jason Monk
4dd013efc1 Fix opening secured networks from QS 
Bug: 21908788
Change-Id: I09b1d22ae8b1815e720bd8c05fa1e38d66d1dcfd
 2015-06-18 12:36:34 -04:00
Jason Monk
163fbd25be am e707ea37: am a0336eb4: am 1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev 
* commit 'e707ea3720188599385be2abaa9efbdf14f0560c':
  Remove battery history graph from details screen
 2015-06-18 16:12:00 +00:00
Junda Liu
9eeb63f501 am 5410a176: am 3d9ccb0f: am 2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides it." into mnc-dev 
* commit '5410a1769821c016f869493c638f18a8f2a79bf0':
  Don't show SIM lock Setting if carrier config hides it.
 2015-06-18 16:11:58 +00:00
Jason Monk
e707ea3720 am a0336eb4: am 1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev 
* commit 'a0336eb47f6256af21fb4b8e3597e04281839d1d':
  Remove battery history graph from details screen
 2015-06-18 15:49:19 +00:00