Commit Graph

9057 Commits

Author SHA1 Message Date
Jason Monk
1cbbec00ab Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev 2015-06-24 19:04:28 +00:00
Jason Monk
b01459997e Fix marquee on app snippet in InstalledAppDetails
First need to fix layout of the app_item as the widget was running
over the end of the view, do this by switching to a RelativeLayout.

Then select the view so it can actually marquee.

Bug: 22043942
Change-Id: Ieb94649ccf3dc8dcf56014c02fcdc06da71a9a62
2015-06-24 14:53:57 -04:00
Akshay Kannan
bc99d35e38 am 2f7fea73: am 5006bf1d: Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev
* commit '2f7fea739a2ef32482412dfa144ee252a62525e2':
  Language Update for Wi-Fi/Bluetooth Scanning
2015-06-24 16:21:41 +00:00
Akshay Kannan
5006bf1de7 Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev 2015-06-24 15:55:32 +00:00
Lifu Tang
55601622d5 Language Update for Wi-Fi/Bluetooth Scanning
Bug: 22046234
Change-Id: Iea8fa2368d1e568a8e1fdd3edefa8f4fc6053e48
2015-06-23 18:54:27 -07:00
Jason Monk
053522c5da am cee74232: am 96a06144: Merge "Add action for search results including the count" into mnc-dev
* commit 'cee742322034b87db0607a945a638c961ad6a51e':
  Add action for search results including the count
2015-06-23 21:07:09 +00:00
Jason Monk
32c8b8745a am df82f5bf: am 52e728ab: Merge "Screen pinning set default lock on exit value" into mnc-dev
* commit 'df82f5bf1b90bc458a22aa0baec3e4f18da4e95c':
  Screen pinning set default lock on exit value
2015-06-23 20:46:01 +00:00
Jason Monk
96a0614409 Merge "Add action for search results including the count" into mnc-dev 2015-06-23 19:49:23 +00:00
Jason Monk
cbbc69b823 Add action for search results including the count
Bug: 20293458
Change-Id: I9d3f04fb74c0e978e69e17898b703e270298fcbc
2015-06-23 14:36:08 -04:00
Selim Cinek
5cb9669141 am d91a08bb: am 966a29dc: Merge "Improved talkback fingerprint enrollment flow" into mnc-dev
* commit 'd91a08bbc37785817f435cac67dba6bae98fbdfb':
  Improved talkback fingerprint enrollment flow
2015-06-23 18:08:16 +00:00
Jason Monk
52e728ab11 Merge "Screen pinning set default lock on exit value" into mnc-dev 2015-06-23 17:30:14 +00:00
Jason Monk
39ab4eae12 Screen pinning set default lock on exit value
The UI default varies based on security state, so make sure we set
the current value when we turn on the feature so that the setting
has the same value as the UI.

Bug: 21999172
Change-Id: I6c920aa93aab391852d6f3a4dd8ee52da5618729
2015-06-23 13:28:27 -04:00
Selim Cinek
966a29dc97 Merge "Improved talkback fingerprint enrollment flow" into mnc-dev 2015-06-23 17:14:43 +00:00
Selim Cinek
e5fc0bae73 Improved talkback fingerprint enrollment flow
Bug: 21565901
Change-Id: If25468574afd25b1a7d19278710045083ba1d4f7
2015-06-23 13:12:24 -04:00
Zoltan Szatmary-Ban
ab40312078 am 26699a07: am 9dd754e1: Merge "Reflect effect of all Wifi editability factors in Settings" into mnc-dev
* commit '26699a07da2931a078349bd381e340bd751e6efd':
  Reflect effect of all Wifi editability factors in Settings
2015-06-23 10:00:26 +00:00
Zoltan Szatmary-Ban
9dd754e1f4 Merge "Reflect effect of all Wifi editability factors in Settings" into mnc-dev 2015-06-23 08:44:45 +00:00
Sanket Padawe
bf4849c8bb am a8c6cb5a: am 4044d6cd: Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev
* commit 'a8c6cb5a72974118adb7f39acb3a906a63541dac':
  Fix display of "Contact sharing" option in Car kit for BT Settings.
2015-06-23 03:20:29 +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
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
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
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
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
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
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
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
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
Zoltan Szatmary-Ban
5de33f402a Reflect effect of all Wifi editability factors in Settings
Bug: 21427528
Bug: 21150087
Bug: 21612565
Change-Id: I62962a9b3fc1bb9c90be79e133873006da102054
2015-06-19 11:06:37 +01: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
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